--- a/js/src/builtin/RegExp.cpp
+++ b/js/src/builtin/RegExp.cpp
@@ -474,44 +474,23 @@ regexp_sticky_impl(JSContext *cx, CallAr
 static bool
 regexp_sticky(JSContext *cx, unsigned argc, JS::Value *vp)
 {
     /* Steps 1-3. */
     CallArgs args = CallArgsFromVp(argc, vp);
     return CallNonGenericMethod<IsRegExp, regexp_sticky_impl>(cx, args);
 }
 
-/* ES6 draft rev32 21.2.5.15. */
-MOZ_ALWAYS_INLINE bool
-regexp_unicode_impl(JSContext *cx, CallArgs args)
-{
-    MOZ_ASSERT(IsRegExp(args.thisv()));
-
-    /* Steps 4-6. */
-    /* FIXME: When the /u flags is supported, return correct value. */
-    args.rval().setBoolean(false);
-    return true;
-}
-
-static bool
-regexp_unicode(JSContext *cx, unsigned argc, JS::Value *vp)
-{
-    /* Steps 1-3. */
-    CallArgs args = CallArgsFromVp(argc, vp);
-    return CallNonGenericMethod<IsRegExp, regexp_unicode_impl>(cx, args);
-}
-
 static const JSPropertySpec regexp_properties[] = {
     JS_PSG("flags", regexp_flags, 0),
     JS_PSG("global", regexp_global, 0),
     JS_PSG("ignoreCase", regexp_ignoreCase, 0),
     JS_PSG("multiline", regexp_multiline, 0),
     JS_PSG("source", regexp_source, 0),
     JS_PSG("sticky", regexp_sticky, 0),
-    JS_PSG("unicode", regexp_unicode, 0),
     JS_PS_END
 };
 
 static const JSFunctionSpec regexp_methods[] = {
 #if JS_HAS_TOSOURCE
     JS_FN(js_toSource_str,  regexp_toString,    0,0),
 #endif
     JS_FN(js_toString_str,  regexp_toString,    0,0),

--- a/js/src/tests/ecma_6/RegExp/descriptor.js
+++ b/js/src/tests/ecma_6/RegExp/descriptor.js
@@ -5,21 +5,25 @@ print(BUGNUMBER + ": " + summary);
 
 var getters = [
   "flags",
   "global",
   "ignoreCase",
   "multiline",
   "source",
   "sticky",
-  "unicode",
+  //"unicode",
 ];
 
 for (var name of getters) {
   var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, name);
   assertEq(desc.configurable, true);
   assertEq(desc.enumerable, false);
   assertEq("writable" in desc, false);
   assertEq("get" in desc, true);
 }
 
+// When the /u flag is supported, remove this comment and the next line, and
+// uncomment "unicode" in |props| above.
+assertThrowsInstanceOf(() => RegExp("", "mygui").flags, SyntaxError);
+
 if (typeof reportCompare === "function")
     reportCompare(true, true);

--- a/js/src/tests/ecma_6/RegExp/flag-accessors.js
+++ b/js/src/tests/ecma_6/RegExp/flag-accessors.js
@@ -3,25 +3,25 @@ var summary = "Implement RegExp.prototyp
 
 print(BUGNUMBER + ": " + summary);
 
 var props = [
   "global",
   "ignoreCase",
   "multiline",
   "sticky",
-  "unicode",
+  //"unicode",
 ];
 
 testThrows(RegExp.prototype);
 test(/foo/iymg, [true, true, true, true, false]);
 test(RegExp(""), [false, false, false, false, false]);
 test(RegExp("", "mygi"), [true, true, true, true, false]);
-// When the /u flag is supported, remove the following line and uncomment the
-// next line.
+// When the /u flag is supported, remove the following line, uncomment the
+// next line, and uncomment "unicode" in |props| above.
 assertThrowsInstanceOf(() => RegExp("", "mygui").flags, SyntaxError);
 // test(RegExp("", "mygiu"), [true, true, true, true, true]);
 
 testThrowsGeneric();
 testThrowsGeneric(1);
 testThrowsGeneric("");
 testThrowsGeneric({});
 testThrowsGeneric(new Proxy({}, {get(){ return true; }}));