--- a/src/share/vm/runtime/advancedThresholdPolicy.cpp	Thu Sep 17 12:58:40 2015 -0700
+++ b/src/share/vm/runtime/advancedThresholdPolicy.cpp	Thu Sep 17 18:25:08 2015 -0700
@@ -161,9 +161,6 @@
 
 // Called with the queue locked and with at least one element
 CompileTask* AdvancedThresholdPolicy::select_task(CompileQueue* compile_queue) {
-#ifdef COMPILERJVMCI
-  CompileTask *max_non_jvmci_task = NULL;
-#endif
   CompileTask *max_task = NULL;
   Method* max_method = NULL;
   jlong t = os::javaTimeMillis();
@@ -194,30 +191,9 @@
         max_method = method;
       }
     }
-#ifdef COMPILERJVMCI
-    if (JVMCICompileAppFirst && (task->comp_level() == CompLevel_full_optimization || !method->has_compiled_code()) &&
-        SystemDictionary::jvmci_loader() != NULL &&
-        method->method_holder()->class_loader() != SystemDictionary::jvmci_loader()) {
-      if (max_non_jvmci_task == NULL) {
-        max_non_jvmci_task = task;
-      } else {
-        // Select a method with a higher rate
-        if (compare_methods(method, max_non_jvmci_task->method())) {
-          max_non_jvmci_task = task;
-        }
-      }
-    }
-#endif
     task = next_task;
   }
 
-#ifdef COMPILERJVMCI
-  if (max_non_jvmci_task != NULL) {
-    max_task = max_non_jvmci_task;
-    max_method = max_task->method();
-  }
-#endif
-
   if (max_task->comp_level() == CompLevel_full_profile && TieredStopAtLevel > CompLevel_full_profile
       && is_method_profiled(max_method)) {
     max_task->set_comp_level(CompLevel_limited_profile);