--- a/src/share/vm/prims/jni.cpp	Fri Nov 23 12:06:31 2012 +0100
+++ b/src/share/vm/prims/jni.cpp	Fri Nov 23 14:08:03 2012 +0100
@@ -35,9 +35,6 @@
 #ifdef GRAAL
 #include "graal/graalCompiler.hpp"
 #endif
-#ifdef HIGH_LEVEL_INTERPRETER
-#include "graal/graalVMToInterpreter.hpp"
-#endif
 #ifndef SERIALGC
 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
 #endif // SERIALGC
@@ -1345,18 +1342,6 @@
   // Initialize result type (must be done after args->iterate())
   result->set_type(args->get_ret_type());
 
-#ifdef HIGH_LEVEL_INTERPRETER
-  // TODO (chaeubl): this is quite a hack. The launcher should take care about that instead.
-  bool invoked_main_method = false;
-  if (HighLevelInterpreterClass != NULL && first_time_InvokeMain && method->name() == vmSymbols::main_name() && method->result_type() == T_VOID) {
-    assert(THREAD->is_Java_thread(), "other threads must not call into java");
-    JavaThread* thread = (JavaThread*)THREAD;
-    first_time_InvokeMain = false;
-    invoked_main_method = true;
-    thread->set_high_level_interpreter_in_vm(true);
-  }
-#endif
-
   JavaCalls::call(result, method, &java_args, CHECK);
 
   // Convert result
@@ -5172,16 +5157,6 @@
       compiler->initialize();
 #endif
 
-#ifdef HIGH_LEVEL_INTERPRETER
-      if (HighLevelInterpreterClass != NULL) {
-        bool result = VMToInterpreter::allocate_interpreter(HighLevelInterpreterClass, HighLevelInterpreterArguments, thread);
-        if (!result) {
-          vm_abort(false);
-          return JNI_ERR;
-        }
-      }
-#endif
-
     // Tracks the time application was running before GC
     RuntimeService::record_application_start();