--- a/hotspot/src/share/vm/runtime/arguments.cpp	Wed Mar 25 15:22:44 2015 +0000
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Wed Mar 25 15:18:37 2015 -0700
@@ -1848,15 +1848,8 @@
   }
 }
 
-// This must be called after ergonomics because we want bytecode rewriting
-// if the server compiler is used, or if UseSharedSpaces is disabled.
+// This must be called after ergonomics.
 void Arguments::set_bytecode_flags() {
-  // Better not attempt to store into a read-only space.
-  if (UseSharedSpaces) {
-    FLAG_SET_DEFAULT(RewriteBytecodes, false);
-    FLAG_SET_DEFAULT(RewriteFrequentPairs, false);
-  }
-
   if (!RewriteBytecodes) {
     FLAG_SET_DEFAULT(RewriteFrequentPairs, false);
   }