diff --git a/js/src/builtin/MapObject.cpp b/js/src/builtin/MapObject.cpp
index dc2dd92fce0..bf4b139a9be 100644
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -1175,7 +1175,7 @@ MapObject::construct(JSContext *cx, unsigned argc, Value *vp)
     if (args.hasDefined(0)) {
         ForOfIterator iter(cx, args[0]);
         while (iter.next()) {
-            RootedObject pairobj(cx, js_ValueToNonNullObject(cx, iter.value()));
+            RootedObject pairobj(cx, ToObject(cx, iter.value()));
             if (!pairobj)
                 return false;
 
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 5cef8b93fa0..70f7c5fb9df 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -985,7 +985,7 @@ js::ValueToIterator(JSContext *cx, unsigned flags, MutableHandleValue vp)
                 return false;
             /* fall through */
         } else {
-            obj = js_ValueToNonNullObject(cx, vp);
+            obj = ToObject(cx, vp);
             if (!obj)
                 return false;
         }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 7edbd4383d6..a7d1cc24426 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -5185,20 +5185,6 @@ js::ToObjectSlow(JSContext *cx, HandleValue val, bool reportScanStack)
     return PrimitiveToObject(cx, val);
 }
 
-JSObject *
-js_ValueToNonNullObject(JSContext *cx, const Value &v)
-{
-    RootedObject obj(cx);
-
-    if (!js_ValueToObjectOrNull(cx, v, &obj))
-        return NULL;
-    if (!obj) {
-        RootedValue val(cx, v);
-        js_ReportIsNullOrUndefined(cx, JSDVG_SEARCH_STACK, val, NullPtr());
-    }
-    return obj;
-}
-
 void
 js_GetObjectSlotName(JSTracer *trc, char *buf, size_t bufsize)
 {
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 9b4a2b48d9f..1aaa33f566d 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -1468,10 +1468,6 @@ PrimitiveToObject(JSContext *cx, const Value &v);
 extern bool
 js_ValueToObjectOrNull(JSContext *cx, const js::Value &v, JS::MutableHandleObject objp);
 
-/* Throws if v could not be converted to an object. */
-extern JSObject *
-js_ValueToNonNullObject(JSContext *cx, const js::Value &v);
-
 namespace js {
 
 /*
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 72d57b8a268..94429fea2bf 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -819,7 +819,7 @@ EnterWith(JSContext *cx, AbstractFramePtr frame, HandleValue val, uint32_t stack
     if (val.isObject()) {
         obj = &val.toObject();
     } else {
-        obj = js_ValueToNonNullObject(cx, val);
+        obj = ToObject(cx, val);
         if (!obj)
             return false;
     }