--- a/hotspot/src/share/vm/runtime/arguments.cpp	Thu Aug 20 12:42:57 2009 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Mon Aug 24 11:13:46 2009 -0700
@@ -1233,10 +1233,8 @@
   // Check that UseCompressedOops can be set with the max heap size allocated
   // by ergonomics.
   if (MaxHeapSize <= max_heap_for_compressed_oops()) {
-    if (FLAG_IS_DEFAULT(UseCompressedOops)) {
-      // Turn off until bug is fixed.
-      // the following line to return it to default status.
-      // FLAG_SET_ERGO(bool, UseCompressedOops, true);
+    if (FLAG_IS_DEFAULT(UseCompressedOops) && !UseG1GC) {
+      FLAG_SET_ERGO(bool, UseCompressedOops, true);
     }
 #ifdef _WIN64
     if (UseLargePages && UseCompressedOops) {