--- a/src/share/vm/compiler/compileBroker.cpp	Thu Jul 03 21:47:59 2014 +0200
+++ b/src/share/vm/compiler/compileBroker.cpp	Thu Jul 03 23:28:35 2014 +0200
@@ -805,18 +805,13 @@
 
 #if defined(COMPILERGRAAL)
   _compilers[1] = graal;
-  if (UseGraalCompilationQueue) {
-    c2_count = 0;
+  if (FLAG_IS_DEFAULT(GraalThreads)) {
+    if (!TieredCompilation && FLAG_IS_DEFAULT(BootstrapGraal) || BootstrapGraal) {
+      // Graal will bootstrap so give it more threads
+      c2_count = os::active_processor_count();
+    }
   } else {
-    if (FLAG_IS_DEFAULT(GraalThreads)) {
-      if (!TieredCompilation && FLAG_IS_DEFAULT(BootstrapGraal) || BootstrapGraal) {
-        // Graal will bootstrap so give it the same number of threads
-        // as we would give the Java based compilation queue.
-        c2_count = os::active_processor_count();
-      }
-    } else {
-      c2_count = GraalThreads;
-    }
+    c2_count = GraalThreads;
   }
 #endif // COMPILERGRAAL
 
@@ -1156,26 +1151,6 @@
     return;
   }
 
-#ifdef COMPILERGRAAL
-  if (UseGraalCompilationQueue) {
-    // In tiered mode we want to only handle highest tier compiles and
-    // in non-tiered mode the default level should be
-    // CompLevel_full_optimization which equals CompLevel_highest_tier.
-    assert(TieredCompilation || comp_level == CompLevel_full_optimization, "incorrect compile level");
-    assert(CompLevel_full_optimization == CompLevel_highest_tier, "incorrect level definition");
-    if (comp_level == CompLevel_full_optimization) {
-      JavaThread* javaThread = JavaThread::current();
-      if (javaThread->can_schedule_graal_compilation()) {
-        bool blockingCompilation = is_compile_blocking(method, osr_bci);
-        NoGraalCompilationScheduling ngcs(javaThread);
-        GraalCompiler::instance()->compile_method(method, osr_bci, NULL, blockingCompilation);
-      }
-      return;
-    }
-    assert(TieredCompilation, "should only reach here in tiered mode");
-  }
-#endif // COMPILERGRAAL
-
   // Outputs from the following MutexLocker block:
   CompileTask* task     = NULL;
   bool         blocking = false;
@@ -1984,13 +1959,12 @@
 
 #ifdef COMPILERGRAAL
   if (comp != NULL && comp->is_graal()) {
-    assert(!UseGraalCompilationQueue, "should not reach here");
     GraalCompiler* graal = (GraalCompiler*) comp;
 
     TraceTime t1("compilation", &time);
     EventCompilation event;
 
-    graal->compile_method(target_handle, osr_bci, task, false);
+    graal->compile_method(target_handle, osr_bci, task);
 
     post_compile(thread, task, event, task->code() != NULL, NULL);
   } else