--- a/process/factory.py
+++ b/process/factory.py
@@ -3748,44 +3748,36 @@ class StagingRepositorySetupFactory(Rele
         # Wait for hg.m.o to catch up
         self.addStep(ShellCommand(
                      name='wait_for_hg',
                      command=['sleep', '600'],
                      description=['wait', 'for', 'hg'],
                      ))
 
 
-class SingleSourceFactory(ReleaseFactory, TooltoolMixin):
+class SingleSourceFactory(ReleaseFactory):
     def __init__(self,
                  productName,
                  version,
                  baseTag,
                  stagingServer,
                  stageUsername,
                  stageSshKey,
                  buildNumber,
                  mozconfig,
                  appVersion=None,
                  objdir='',
                  mozillaDir=None,
                  mozillaSrcDir=None,
                  autoconfDirs=['.'],
                  buildSpace=2,
-                 tooltool_manifest_src=None,
-                 tooltool_bootstrap="setup.sh",
-                 tooltool_url_list=None,
-                 tooltool_script=None,
                  **kwargs):
         ReleaseFactory.__init__(self, buildSpace=buildSpace, **kwargs)
 
         self.mozconfig = mozconfig
-        self.tooltool_manifest_src = tooltool_manifest_src
-        self.tooltool_url_list = tooltool_url_list or []
-        self.tooltool_script = tooltool_script or ['/tools/tooltool.py']
-        self.tooltool_bootstrap = tooltool_bootstrap
         self.releaseTag = '%s_RELEASE' % (baseTag)
         self.origSrcDir = self.branchName
 
         # Mozilla subdir
         if mozillaDir:
             self.mozillaDir = '/%s' % mozillaDir
             self.mozillaSrcDir = '%s/%s' % (self.origSrcDir, mozillaDir)
         else:
@@ -3805,16 +3797,17 @@ class SingleSourceFactory(ReleaseFactory
         # Make sure MOZ_PKG_PRETTYNAMES is set so that our source package is
         # created in the expected place.
         self.env['MOZ_OBJDIR'] = self.objdir
         self.env['MOZ_PKG_PRETTYNAMES'] = '1'
         if appVersion is None or version != appVersion or \
                 (self.branchName == 'mozilla-1.9.2' and productName == 'xulrunner'):
             self.env['MOZ_PKG_VERSION'] = version
         self.env['MOZ_PKG_APPNAME'] = productName
+        self.env['no_tooltool'] = "1"
 
         # '-c' is for "release to candidates dir"
         postUploadCmd = 'post_upload.py -p %s -v %s -n %s -c' % \
             (productName, version, buildNumber)
         if productName == 'fennec':
             postUploadCmd = 'post_upload.py -p mobile --nightly-dir candidates -v %s -n %s -c' % \
                 (version, buildNumber)
         uploadEnv = self.env.copy()
@@ -3842,18 +3835,16 @@ class SingleSourceFactory(ReleaseFactory
                      ))
         self.addStep(SetProperty(
                      name='hg_ident_revision',
                      command=['hg', 'identify', '-i'],
                      property='revision',
                      workdir=self.mozillaSrcDir,
                      haltOnFailure=True
                      ))
-        if self.tooltool_manifest_src:
-            self.addTooltoolStep(workdir=self.origSrcDir)
         self.addConfigSteps(workdir=self.mozillaSrcDir)
         self.addStep(MockCommand(
                      name='configure',
                      command=self.makeCmd + ['-f', 'client.mk', 'configure'],
                      workdir=self.mozillaSrcDir,
                      env=self.env,
                      description=['configure'],
                      mock=self.use_mock,

--- a/process/release.py
+++ b/process/release.py
@@ -533,19 +533,16 @@ def generateReleaseBranchObjects(release
             clobberURL=clobberer_url,
             clobberBranch='release-%s' % sourceRepoInfo['name'],
             mozconfig=mozconfig,
             signingServers=getSigningServers('linux'),
             use_mock=source_use_mock,
             mock_target=pf.get('mock_target'),
             mock_packages=pf.get('mock_packages'),
             mock_copyin_files=pf.get('mock_copyin_files'),
-            tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
-            tooltool_url_list=branchConfig.get('tooltool_url_list', []),
-            tooltool_script=pf.get('tooltool_script'),
         )
 
         builders.append({
                         'name': builderPrefix('%s_source' % releaseConfig['productName']),
                         'slavenames': branchConfig['platforms']['linux']['slaves'] +
                         branchConfig['platforms']['linux64']['slaves'],
                         'category': builderPrefix(''),
                         'builddir': builderPrefix(
@@ -588,19 +585,16 @@ def generateReleaseBranchObjects(release
                 clobberURL=clobberer_url,
                 clobberBranch='release-%s' % sourceRepoInfo['name'],
                 mozconfig=mozconfig,
                 signingServers=getSigningServers('linux'),
                 use_mock=use_mock('linux'),
                 mock_target=pf.get('mock_target'),
                 mock_packages=pf.get('mock_packages'),
                 mock_copyin_files=pf.get('mock_copyin_files'),
-                tooltool_manifest_src=pf.get('tooltool_manifest_src', None),
-                tooltool_url_list=branchConfig.get('tooltool_url_list', []),
-                tooltool_script=pf.get('tooltool_script'),
             )
 
             builders.append({
                             'name': builderPrefix('xulrunner_source'),
                             'slavenames': branchConfig['platforms']['linux']['slaves'] +
                             branchConfig['platforms']['linux64']['slaves'],
                             'category': builderPrefix(''),
                             'builddir': builderPrefix('xulrunner_source'),