diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp
index ee55f2055bc..04ef222cb2e 100644
--- a/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -498,15 +498,6 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
                 {
                     return JS_FALSE;
                 }
-
-                // We seem to sometime lose the unrooted global flag. Restore it
-                // here. FIXME: bug 584495.
-                JSContext *iter = nsnull, *acx;
-
-                while((acx = JS_ContextIterator(GetJSRuntime(), &iter))) {
-                    if (!JS_HAS_OPTION(acx, JSOPTION_UNROOTED_GLOBAL))
-                        JS_ToggleOptions(acx, JSOPTION_UNROOTED_GLOBAL);
-                }
                 break;
             }
             case JSGC_MARK_END: