--- a/build/autoconf/config.status.m4
+++ b/build/autoconf/config.status.m4
@@ -100,18 +100,16 @@ AC_CACHE_SAVE
 
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 : ${CONFIG_STATUS=./config.data}
 
 dnl We're going to need [ ] for python syntax.
 changequote(<<<, >>>)dnl
 echo creating $CONFIG_STATUS
 
-extra_python_path=${COMM_BUILD:+"'mozilla', "}
-
 cat > $CONFIG_STATUS <<EOF
 def unique_list(l):
     result = []
     for i in l:
         if l not in result:
             result.append(i)
     return result
 

--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1396,18 +1396,17 @@ class MachDebug(MachCommandBase):
             print('FOUND_MOZCONFIG=%s' % mozpath.normsep(self.mozconfig['path']),
                 file=out)
 
     def _environment_configure(self, out, verbose):
         if self.mozconfig['path']:
             # Replace ' with '"'"', so that shell quoting e.g.
             # a'b becomes 'a'"'"'b'.
             quote = lambda s: s.replace("'", """'"'"'""")
-            if self.mozconfig['configure_args'] and \
-                    'COMM_BUILD' not in os.environ:
+            if self.mozconfig['configure_args']:
                 print('echo Adding configure options from %s' %
                     mozpath.normsep(self.mozconfig['path']), file=out)
                 for arg in self.mozconfig['configure_args']:
                     quoted_arg = quote(arg)
                     print("echo '  %s'" % quoted_arg, file=out)
                     print("""set -- "$@" '%s'""" % quoted_arg, file=out)
             for key, value in self.mozconfig['env']['added'].items():
                 print("export %s='%s'" % (key, quote(value)), file=out)