--- a/misc.py
+++ b/misc.py
@@ -1294,29 +1294,16 @@ def generateBranchObjects(config, name, 
             relayhost="mail.build.mozilla.org",
             sendToInterestedUsers=sendToInterestedUsers,
             extraRecipients=extraRecipients,
             branches=[config['repo_path']],
             messageFormatter=lambda c: buildTryChangeMessage(c,
                                                              '/'.join([packageUrl, packageDir])),
         ))
 
-    if config['enable_l10n']:
-        l10n_builders = []
-        for b in l10nBuilders:
-            if config['enable_l10n_onchange']:
-                l10n_builders.append(l10nBuilders[b]['l10n_builder'])
-            l10n_builders.append(
-                l10nNightlyBuilders['%s nightly' % b]['l10n_builder'])
-        l10n_binaryURL = config['enUS_binaryURL']
-        if l10n_binaryURL.endswith('/'):
-            l10n_binaryURL = l10n_binaryURL[:-1]
-        l10n_binaryURL += "-l10n"
-        nomergeBuilders.update(l10n_builders)
-
     tipsOnly = False
     maxChanges = 100
     if config.get('enable_try', False):
         # Pay attention to all branches for pushes to try
         repo_branch = None
     else:
         # Other branches should only pay attention to the default branch
         repo_branch = "default"
@@ -1383,16 +1370,17 @@ def generateBranchObjects(config, name, 
             fileIsImportant=fileIsImportant,
             **extra_args
         ))
 
     if config['enable_l10n']:
         l10n_builders = []
         for b in l10nBuilders:
             l10n_builders.append(l10nBuilders[b]['l10n_builder'])
+        nomergeBuilders.update(l10n_builders)
         # This L10n scheduler triggers only the builders of its own branch
         branchObjects['schedulers'].append(Scheduler(
             name="%s l10n" % name,
             branch=config['l10n_repo_path'],
             treeStableTimer=None,
             builderNames=l10n_builders,
             fileIsImportant=lambda c: isImportantL10nFile(
                 c, config['l10n_modules']),
@@ -1448,16 +1436,17 @@ def generateBranchObjects(config, name, 
                 minute=minute,
             )
         branchObjects['schedulers'].append(periodic_scheduler)
 
     for builder in nightlyBuilders + xulrunnerNightlyBuilders:
         if config['enable_l10n'] and \
                 config['enable_nightly'] and builder in l10nNightlyBuilders:
             l10n_builder = l10nNightlyBuilders[builder]['l10n_builder']
+            nomergeBuilders.add(l10n_builder)
             platform = l10nNightlyBuilders[builder]['platform']
             branchObjects['schedulers'].append(TriggerableL10n(
                                                name=l10n_builder,
                                                platform=platform,
                                                builderNames=[l10n_builder],
                                                branch=config['repo_path'],
                                                baseTag='default',
                                                localesURL=config.get(