diff --git a/bin/hbase b/bin/hbase
index 81d5e10e427..f079b301ece 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -206,7 +206,6 @@ fi
 # and are named like the following: java_pid21612.hprof. Apparently it doesn't
 # 'cost' to have this flag enabled. Its a 1.6 flag only. See:
 # http://blogs.sun.com/alanb/entry/outofmemoryerror_looks_a_bit_better
-HBASE_OPTS="$HBASE_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 HBASE_OPTS="$HBASE_OPTS -Dhbase.log.dir=$HBASE_LOG_DIR"
 HBASE_OPTS="$HBASE_OPTS -Dhbase.log.file=$HBASE_LOGFILE"
 HBASE_OPTS="$HBASE_OPTS -Dhbase.home.dir=$HBASE_HOME"
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index 352cb2c2b70..4d20dc62703 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -31,9 +31,10 @@
 # export HBASE_HEAPSIZE=1000
 
 # Extra Java runtime options.
-# Below are what we set by default.  For more on why as well as other possible
-# settings, see http://wiki.apache.org/hadoop/PerformanceTuning
-# export HBASE_OPTS="$HBASE_OPTS -XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
+# Below are what we set by default.  May only work with SUN JVM.
+# For more on why as well as other possible settings,
+# see http://wiki.apache.org/hadoop/PerformanceTuning
+export HBASE_OPTS="-XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 
 # File naming hosts on which HRegionServers will run.  $HBASE_HOME/conf/regionservers by default.
 # export HBASE_REGIONSERVERS=${HBASE_HOME}/conf/regionservers