--- a/process/factory.py
+++ b/process/factory.py
@@ -1281,23 +1281,19 @@ class MercurialBuildFactory(MozillaBuild
         Looks for self._gotBuildInfo to make sure we only run this set of steps
         once."""
         if not getattr(self, '_gotBuildInfo', False):
             printconfig_env = self.env.copy()
             printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
             del printconfig_env['MOZ_OBJDIR']
             printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
 
-            if self.mozillaSrcDir:
-                machPath = '%(basedir)s/build/mozilla/mach'
-                python = [WithProperties('%(basedir)s/' +
-                          '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
-            else:
-                machPath = '%(basedir)s/build/mach'
-                python = ['/tools/buildbot/bin/python']
+            machPath = '%(basedir)s' + self.absMozillaSrcDir + '/mach'
+            python = [WithProperties('%(basedir)s/' +
+                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
 
             # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
             if self.platform.startswith('win'):
                 python = ['c:/mozilla-build/python27/python', '-u']
 
             # we need abs paths because we are in a non relative workdir
             printconfig_base_command = python + [
                 WithProperties(machPath), 'python',
@@ -1582,23 +1578,19 @@ class MercurialBuildFactory(MozillaBuild
                                             fileType='installer',
                                             haltOnFailure=True)
 
         printconfig_env = self.env.copy()
         printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
         del printconfig_env['MOZ_OBJDIR']
         printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
 
-        if self.mozillaSrcDir:
-            machPath = '%(basedir)s/build/mozilla/mach'
-            python = [WithProperties('%(basedir)s/' +
-                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
-        else:
-            machPath = '%(basedir)s/build/mach'
-            python = ['/tools/buildbot/bin/python']
+        machPath = '%(basedir)s' + self.absMozillaSrcDir + '/mach'
+        python = [WithProperties('%(basedir)s/' +
+                  '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
 
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
         if self.platform.startswith('win'):
             python = ['c:/mozilla-build/python27/python', '-u']
 
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',
@@ -2084,23 +2076,19 @@ class NightlyBuildFactory(MercurialBuild
             workdir=self.absMozillaObjDir,
             haltOnFailure=True,
         ))
         printconfig_env = self.env.copy()
         printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
         del printconfig_env['MOZ_OBJDIR']
         printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
 
-        if self.mozillaSrcDir:
-            machPath = '%(basedir)s/build/mozilla/mach'
-            python = [WithProperties('%(basedir)s/' +
-                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
-        else:
-            machPath = '%(basedir)s/build/mach'
-            python = ['/tools/buildbot/bin/python']
+        machPath = '%(basedir)s' + self.absMozillaSrcDir + '/mach'
+        python = [WithProperties('%(basedir)s/' +
+                  '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
 
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
         if self.platform.startswith('win'):
             python = ['c:/mozilla-build/python27/python', '-u']
 
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',
@@ -3488,23 +3476,19 @@ class NightlyRepackFactory(BaseRepackFac
             haltOnFailure=True,
         ))
         printconfig_env = self.env.copy()
         printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
         del printconfig_env['MOZ_OBJDIR']
         printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
 
-        if self.mozillaSrcDir:
-            machPath = '%(basedir)s/build/mozilla/mach'
-            python = [WithProperties('%(basedir)s/' +
-                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
-        else:
-            machPath = '%(basedir)s/build/mach'
-            python = ['/tools/buildbot/bin/python']
+        machPath = '%(basedir)s' + self.absMozillaSrcDir + '/mach'
+        python = [WithProperties('%(basedir)s/' +
+                  '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
 
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
         if self.platform.startswith('win'):
             python = ['c:/mozilla-build/python27/python', '-u']
 
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',