diff --git a/js/src/jsgc.c b/js/src/jsgc.c
index bc8510dbbe3..2abdbbfeaa2 100644
--- a/js/src/jsgc.c
+++ b/js/src/jsgc.c
@@ -1570,6 +1570,7 @@ js_GC(JSContext *cx, uintN gcflags)
         return;
     }
     METER(rt->gcStats.poke++);
+    rt->gcPoke = JS_FALSE;
 
 #ifdef JS_THREADSAFE
     /* Bump gcLevel and return rather than nest on this thread. */
@@ -1911,15 +1912,16 @@ restart:
 #endif
 
     JS_LOCK_GC(rt);
-    if (rt->gcLevel > 1) {
+    if (rt->gcLevel > 1 || rt->gcPoke) {
         rt->gcLevel = 1;
+        rt->gcPoke = JS_FALSE;
         JS_UNLOCK_GC(rt);
         goto restart;
     }
     js_EnablePropertyCache(cx);
     rt->gcLevel = 0;
     rt->gcLastBytes = rt->gcBytes;
-    rt->gcPoke = rt->gcRunning = JS_FALSE;
+    rt->gcRunning = JS_FALSE;
 
 #ifdef JS_THREADSAFE
     /* If we were invoked during a request, pay back the temporary debit. */
diff --git a/js/src/jsinterp.c b/js/src/jsinterp.c
index b75ca3deb28..170e888e568 100644
--- a/js/src/jsinterp.c
+++ b/js/src/jsinterp.c
@@ -147,10 +147,6 @@ prop_iterator_finalize(JSContext *cx, JSObject *obj)
                       &iter_state, NULL);
     }
     js_RemoveRoot(cx->runtime, &obj->slots[JSSLOT_PARENT]);
-
-    /* XXX force the GC to restart so we can collect iteratee, if possible,
-           during the current collector activation */
-    cx->runtime->gcLevel++;
 }
 
 static JSClass prop_iterator_class = {