--- a/src/hotspot/share/prims/jni.cpp	Mon Dec 10 13:45:12 2018 -0500
+++ b/src/hotspot/share/prims/jni.cpp	Mon Dec 10 11:04:55 2018 -0800
@@ -437,8 +437,9 @@
   // If we were the first invocation of jni_FindClass, we enable compilation again
   // rather than just allowing invocation counter to overflow and decay.
   // Controlled by flag DelayCompilationDuringStartup.
-  if (first_time && !CompileTheWorld)
+  if (first_time) {
     CompilationPolicy::completed_vm_startup();
+  }
 
   return result;
 JNI_END
@@ -3969,8 +3970,6 @@
     post_thread_start_event(thread);
 
 #ifndef PRODUCT
-    // Check if we should compile all classes on bootclasspath
-    if (CompileTheWorld) ClassLoader::compile_the_world();
     if (ReplayCompiles) ciReplay::replay(thread);
 
     // Some platforms (like Win*) need a wrapper around these test