--- a/src/share/vm/prims/jni.cpp	Mon Aug 24 19:16:03 2015 -0700
+++ b/src/share/vm/prims/jni.cpp	Mon Aug 24 19:17:08 2015 -0700
@@ -5209,28 +5209,11 @@
     *vm = (JavaVM *)(&main_vm);
     *(JNIEnv**)penv = thread->jni_environment();
 
-#if INCLUDE_JVMCI
-    // We turn off CompileTheWorld so that compilation requests are not ignored during bootstrap or that JVMCI can be compiled by C1/C2.
-    bool doCTW = CompileTheWorld;
-    CompileTheWorld = false;
-#endif
-
 #ifdef COMPILERJVMCI
     // JVMCI is initialized on a CompilerThread
     if (BootstrapJVMCI) {
       JVMCICompiler::instance()->bootstrap();
     }
-#elif INCLUDE_JVMCI
-    if (doCTW) {
-      // required for hosted CTW.
-      CompilationPolicy::completed_vm_startup();
-    }
-#endif
-
-#if INCLUDE_JVMCI
-    if (doCTW) {
-      JVMCICompiler::instance()->compile_the_world();
-    }
 #endif
 
     // Tracks the time application was running before GC