diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index d60f24857aa..8a8c93f8a10 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2008,9 +2008,8 @@ JS_ResolveStandardClass(JSContext *cx, HandleObject obj, HandleId id, JSBool *re
 }
 
 JS_PUBLIC_API(JSBool)
-JS_EnumerateStandardClasses(JSContext *cx, JSObject *objArg)
+JS_EnumerateStandardClasses(JSContext *cx, HandleObject obj)
 {
-    RootedObject obj(cx, objArg);
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
     assertSameCompartment(cx, obj);
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 42be4e28266..e56a2084397 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2105,7 +2105,7 @@ JS_ResolveStandardClass(JSContext *cx, JS::HandleObject obj, JS::HandleId id,
                         JSBool *resolved);
 
 extern JS_PUBLIC_API(JSBool)
-JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj);
+JS_EnumerateStandardClasses(JSContext *cx, JS::HandleObject obj);
 
 /*
  * Enumerate any already-resolved standard class ids into ida, or into a new
diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index 58a368d3d7c..acf0230fba0 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -2936,7 +2936,7 @@ CreateXMLHttpRequest(JSContext *cx, unsigned argc, jsval *vp)
 }
 
 static JSBool
-sandbox_enumerate(JSContext *cx, JSHandleObject obj)
+sandbox_enumerate(JSContext *cx, HandleObject obj)
 {
     return JS_EnumerateStandardClasses(cx, obj);
 }