--- a/hotspot/src/share/vm/runtime/arguments.cpp	Thu Jul 28 09:57:49 2016 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Fri Jul 29 09:23:05 2016 +0200
@@ -2277,11 +2277,7 @@
 #if INCLUDE_JVMCI
 // Check consistency of jvmci vm argument settings.
 bool Arguments::check_jvmci_args_consistency() {
-  if (!EnableJVMCI && !JVMCIGlobals::check_jvmci_flags_are_consistent()) {
-    JVMCIGlobals::print_jvmci_args_inconsistency_error_message();
-    return false;
-  }
-  return true;
+   return JVMCIGlobals::check_jvmci_flags_are_consistent();
 }
 #endif //INCLUDE_JVMCI