--- a/hotspot/src/share/vm/compiler/compilerDirectives.cpp	Tue Jan 17 17:00:22 2017 +0100
+++ b/hotspot/src/share/vm/compiler/compilerDirectives.cpp	Tue Jan 17 21:38:07 2017 -0800
@@ -445,7 +445,9 @@
   _default_directives->_c1_store->EnableOption = true;
 #endif
 #ifdef COMPILER2
-  _default_directives->_c2_store->EnableOption = true;
+  if (is_server_compilation_mode_vm()) {
+    _default_directives->_c2_store->EnableOption = true;
+  }
 #endif
   assert(error_msg == NULL, "Must succeed.");
   push(_default_directives);