--- a/automation/taskcluster/docker-aarch64/setup.sh
+++ b/automation/taskcluster/docker-aarch64/setup.sh
@@ -21,22 +21,22 @@ apt_packages=()
 apt_packages+=('build-essential')
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
 apt_packages+=('libxml2-utils')
 apt_packages+=('zlib1g-dev')
 apt_packages+=('ninja-build')
 apt_packages+=('gyp')
 apt_packages+=('mercurial')
+apt_packages+=('locales')
 
 # Install packages.
 apt-get install -y --no-install-recommends ${apt_packages[@]}
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache
 apt-get autoremove -y
 apt-get clean
 apt-get autoclean
 rm $0

--- a/automation/taskcluster/docker-arm/setup.sh
+++ b/automation/taskcluster/docker-arm/setup.sh
@@ -7,30 +7,30 @@ export DEBIAN_FRONTEND=noninteractive
 # Update.
 apt-get -y update
 apt-get -y dist-upgrade
 
 apt_packages=()
 apt_packages+=('build-essential')
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
+apt_packages+=('locales')
 apt_packages+=('python-dev')
 apt_packages+=('python-pip')
 apt_packages+=('python-setuptools')
 apt_packages+=('zlib1g-dev')
 
 # Install packages.
 apt-get install -y --no-install-recommends ${apt_packages[@]}
 
 # Latest Mercurial.
 pip install --upgrade pip
 pip install Mercurial
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache
 apt-get autoremove -y
 apt-get clean
 apt-get autoclean
 rm $0

--- a/automation/taskcluster/docker-clang-3.9/setup.sh
+++ b/automation/taskcluster/docker-clang-3.9/setup.sh
@@ -7,16 +7,17 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get -y update && apt-get -y upgrade
 
 # Need this to add keys for PPAs below.
 apt-get install -y --no-install-recommends apt-utils
 
 apt_packages=()
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
+apt_packages+=('locales')
 apt_packages+=('xz-utils')
 
 # Latest Mercurial.
 apt_packages+=('mercurial')
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 41BD8711B1F0EC2B0D85B91CF59CE3A8323293EE
 echo "deb http://ppa.launchpad.net/mercurial-ppa/releases/ubuntu xenial main" > /etc/apt/sources.list.d/mercurial.list
 
 # Install packages.
@@ -29,18 +30,17 @@ curl -LO http://releases.llvm.org/3.9.1/
 # Verify the signature.
 gpg --keyserver pool.sks-keyservers.net --recv-keys B6C8F98282B944E3B0D5C2530FC3042E345AD05D
 gpg --verify *.tar.xz.sig
 # Install into /usr/local/.
 tar xJvf *.tar.xz -C /usr/local --strip-components=1
 # Cleanup.
 rm *.tar.xz*
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache
 apt-get autoremove -y
 apt-get clean
 apt-get autoclean
 rm $0

--- a/automation/taskcluster/docker-decision/setup.sh
+++ b/automation/taskcluster/docker-decision/setup.sh
@@ -2,17 +2,17 @@
 
 set -v -e -x
 
 # Update packages.
 export DEBIAN_FRONTEND=noninteractive
 apt-get -y update && apt-get -y upgrade
 
 # Need those to install newer packages below.
-apt-get install -y --no-install-recommends apt-utils curl ca-certificates
+apt-get install -y --no-install-recommends apt-utils curl ca-certificates locales
 
 # Latest Mercurial.
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 41BD8711B1F0EC2B0D85B91CF59CE3A8323293EE
 echo "deb http://ppa.launchpad.net/mercurial-ppa/releases/ubuntu xenial main" > /etc/apt/sources.list.d/mercurial.list
 
 # Install packages.
 apt-get -y update && apt-get install -y --no-install-recommends mercurial
 

--- a/automation/taskcluster/docker-fuzz/setup.sh
+++ b/automation/taskcluster/docker-fuzz/setup.sh
@@ -12,16 +12,17 @@ apt-get install -y --no-install-recommen
 apt_packages=()
 apt_packages+=('build-essential')
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
 apt_packages+=('git')
 apt_packages+=('gyp')
 apt_packages+=('libssl-dev')
 apt_packages+=('libxml2-utils')
+apt_packages+=('locales')
 apt_packages+=('ninja-build')
 apt_packages+=('pkg-config')
 apt_packages+=('zlib1g-dev')
 
 # Latest Mercurial.
 apt_packages+=('mercurial')
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 41BD8711B1F0EC2B0D85B91CF59CE3A8323293EE
 echo "deb http://ppa.launchpad.net/mercurial-ppa/releases/ubuntu xenial main" > /etc/apt/sources.list.d/mercurial.list
@@ -32,18 +33,17 @@ apt-get install -y --no-install-recommen
 
 # Install LLVM/clang-4.0.
 mkdir clang-tmp
 git clone -n --depth 1 https://chromium.googlesource.com/chromium/src/tools/clang clang-tmp/clang
 git -C clang-tmp/clang checkout HEAD scripts/update.py
 clang-tmp/clang/scripts/update.py
 rm -fr clang-tmp
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache
 apt-get autoremove -y
 apt-get clean
 apt-get autoclean
 rm $0

--- a/automation/taskcluster/docker/setup.sh
+++ b/automation/taskcluster/docker/setup.sh
@@ -12,16 +12,17 @@ apt-get install -y --no-install-recommen
 apt_packages=()
 apt_packages+=('build-essential')
 apt_packages+=('ca-certificates')
 apt_packages+=('curl')
 apt_packages+=('npm')
 apt_packages+=('git')
 apt_packages+=('golang-1.6')
 apt_packages+=('libxml2-utils')
+apt_packages+=('locales')
 apt_packages+=('ninja-build')
 apt_packages+=('pkg-config')
 apt_packages+=('zlib1g-dev')
 
 # 32-bit builds
 apt_packages+=('lib32z1-dev')
 apt_packages+=('gcc-multilib')
 apt_packages+=('g++-multilib')
@@ -58,18 +59,17 @@ gpg --verify *.tar.xz.sig
 # Install into /usr/local/.
 tar xJvf *.tar.xz -C /usr/local --strip-components=1
 # Cleanup.
 rm *.tar.xz*
 
 # Install latest Rust (stable).
 su worker -c "curl https://sh.rustup.rs -sSf | sh -s -- -y"
 
-# XXX Currently broken (bug 1361413).
-#locale-gen en_US.UTF-8
-#dpkg-reconfigure locales
+locale-gen en_US.UTF-8
+dpkg-reconfigure locales
 
 # Cleanup.
 rm -rf ~/.ccache ~/.cache
 apt-get autoremove -y
 apt-get clean
 apt-get autoclean
 rm $0