diff --git a/build/pymake/make.py b/build/pymake/make.py
index 845ddb12e720..8379b71f01a4 100755
--- a/build/pymake/make.py
+++ b/build/pymake/make.py
@@ -17,15 +17,6 @@
 
   gc.disable()
 
-  # This is meant as a temporary workaround until issues with many targets
-  # and prerequisites is addressed. Bug 874210 tracks.
-  #
-  # The default recursion limit for CPython is 1000.
-  try:
-      sys.setrecursionlimit(10000)
-  except Exception:
-      print >>sys.stderr, 'Unable to increase Python recursion limit.'
-
   pymake.command.main(sys.argv[1:], os.environ, os.getcwd(), cb=sys.exit)
   pymake.process.ParallelContext.spin()
   assert False, "Not reached"
diff --git a/build/pymake/pymake/data.py b/build/pymake/pymake/data.py
index 6fea059ac852..dcd7e922580d 100644
--- a/build/pymake/pymake/data.py
+++ b/build/pymake/pymake/data.py
@@ -780,7 +780,8 @@ def runnext(self):
             return
 
         self.currunning = True
-        self.rlist.pop(0).runcommands(self.indent, self.commandscb)
+        rule = self.rlist.pop(0)
+        self.makefile.context.defer(rule.runcommands, self.indent, self.commandscb)
 
     def commandscb(self, error):
         assert error in (True, False)