diff --git a/src/regexp.js b/src/regexp.js
index 9d36411a63..38d4496153 100644
--- a/src/regexp.js
+++ b/src/regexp.js
@@ -408,9 +408,9 @@ var lastMatchInfoOverride = null;
 function SetUpRegExp() {
   %CheckIsBootstrapping();
   %FunctionSetInstanceClassName($RegExp, 'RegExp');
+  %FunctionSetPrototype($RegExp, new $Object());
   %SetProperty($RegExp.prototype, 'constructor', $RegExp, DONT_ENUM);
   %SetCode($RegExp, RegExpConstructor);
-  %FunctionSetPrototype($RegExp, new $RegExp());
 
   InstallFunctions($RegExp.prototype, DONT_ENUM, $Array(
     "exec", RegExpExec,
diff --git a/test/mjsunit/regress/regress-1217.js b/test/mjsunit/bugs/bug-1217.js
similarity index 100%
rename from test/mjsunit/regress/regress-1217.js
rename to test/mjsunit/bugs/bug-1217.js