--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -75,48 +75,37 @@ job-template:
             linux64-l10n: linux64/opt
             linux-l10n: linux32/opt
             macosx64: osx-cross/opt
             android-api-16-l10n: android-4-0-armv7-api16/opt
    mozharness:
       config:
          by-build-platform:
             linux-l10n:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/linux32.py
                - single_locale/tc_linux32.py
             linux64-l10n:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/linux64.py
                - single_locale/tc_linux64.py
             macosx64:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/macosx64.py
                - single_locale/tc_macosx64.py
             android-api-16-l10n:
                - single_locale/{project}_android-api-16.py
                - single_locale/tc_android-api-16.py
       # no default, so we fail on new entries
       options:
-         by-build-platform:
-            linux-l10n:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/linux32.py
-               - total-chunks=1
-               - this-chunk=1
-            linux64-l10n:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/linux64.py
-               - total-chunks=1
-               - this-chunk=1
-            macosx64:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/macosx64.py
-               - total-chunks=1
-               - this-chunk=1
-            default:
-               - total-chunks=1
-               - this-chunk=1
+         - total-chunks=1
+         - this-chunk=1
       actions:
          by-build-platform:
             default: [clone-locales list-locales setup repack summary]
             android-api-16-l10n: [get-secrets
                                   clone-locales list-locales setup repack
                                   upload-repacks summary]
       script:
          by-build-platform:

--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -144,97 +144,82 @@ job-template:
          android-api-16-nightly:
             EN_US_PACKAGE_NAME: target.apk
             EN_US_BINARY_URL:
                task-reference: https://queue.taskcluster.net/v1/task/<unsigned-build>/artifacts/public/build/en-US
    mozharness:
       config:
          by-build-platform:
             linux-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/linux32.py
                - single_locale/tc_linux32.py
                - taskcluster_nightly.py
             linux64-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/linux64.py
                - single_locale/tc_linux64.py
                - taskcluster_nightly.py
             macosx64-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/macosx64.py
                - single_locale/tc_macosx64.py
                - taskcluster_nightly.py
-            win32-nightly: []
-            win64-nightly: []
+            win32-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/win32.py
+               - single_locale/tc_win32.py
+               - taskcluster_nightly.py
+            win64-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/win64.py
+               - single_locale/tc_win64.py
+               - taskcluster_nightly.py
             linux-devedition-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/linux_devedition.py
                - single_locale/tc_linux32.py
                - taskcluster_nightly.py
             linux64-devedition-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/linux64_devedition.py
                - single_locale/tc_linux64.py
                - taskcluster_nightly.py
             macosx64-devedition-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/macosx64_devedition.py
                - single_locale/tc_macosx64.py
                - taskcluster_nightly.py
-            win32-devedition-nightly: []
-            win64-devedition-nightly: []
+            win32-devedition-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/win32_devedition.py
+               - single_locale/tc_win32.py
+               - taskcluster_nightly.py
+            win64-devedition-nightly:
+               - single_locale/production.py
+               - single_locale/{project}.py
+               - single_locale/win64_devedition.py
+               - single_locale/tc_win64.py
+               - taskcluster_nightly.py
             android-api-16-nightly:
                - taskcluster_nightly.py
                - single_locale/{project}_android-api-16.py
                - single_locale/tc_android-api-16.py
       # no default, so we fail on new entries
       options:
-         by-build-platform:
-            linux-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/linux32.py
-            linux64-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/linux64.py
-            macosx64-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/macosx64.py
-            win32-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/win32.py
-               - config=single_locale/tc_win32.py
-               - config=taskcluster_nightly.py
-               - revision=$GECKO_HEAD_REV
-            win64-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/win64.py
-               - config=single_locale/tc_win64.py
-               - config=taskcluster_nightly.py
-               - revision=$GECKO_HEAD_REV
-            linux-devedition-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/linux_devedition.py
-            linux64-devedition-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/linux64_devedition.py
-            macosx64-devedition-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/macosx64_devedition.py
-            win32-devedition-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/win32_devedition.py
-               - config=single_locale/tc_win32.py
-               - config=taskcluster_nightly.py
-               - revision=$GECKO_HEAD_REV
-            win64-devedition-nightly:
-               - environment-config=single_locale/production.py
-               - branch-config=single_locale/{project}.py
-               - platform-config=single_locale/win64_devedition.py
-               - config=single_locale/tc_win64.py
-               - config=taskcluster_nightly.py
-               - revision=$GECKO_HEAD_REV
-            default: []
+         - revision=$GECKO_HEAD_REV
       actions:
          by-build-platform:
             default: ['clone-locales', 'list-locales', 'setup', 'repack',
                       'submit-to-balrog', 'summary']
             android-api-16-nightly: ['get-secrets',
                                      'clone-locales', 'list-locales', 'setup', 'repack',
                                      'upload-repacks', 'submit-to-balrog', 'summary']
       script:

--- a/taskcluster/scripts/builder/build-l10n.sh
+++ b/taskcluster/scripts/builder/build-l10n.sh
@@ -93,16 +93,15 @@ if [ -n "$MOZHARNESS_OPTIONS" ]; then
         options="$options --$option"
     done
 fi
 
 cd /builds/worker
 
 python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
   --disable-mock \
-  --revision ${GECKO_HEAD_REV} \
   $actions \
   $options \
   ${config_path_cmds} \
   ${config_cmds} \
   --log-level=debug \
   --scm-level=$MOZ_SCM_LEVEL \
   --work-dir=$WORKSPACE/build \