--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Tue Jan 12 15:01:52 2016 +0000
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Wed Jan 13 15:57:42 2016 +0000
@@ -629,21 +629,10 @@
     TraceClassUnloading = value != 0;
     break;
   case JVMTI_VERBOSE_GC:
-    {
-      // This is a temporary solution to work around initialization issues.
-      // JDK-8145083 will fix this.
-      Mutex* conf_mutex = LogConfiguration_lock;
-      if (Threads::number_of_threads() == 0) {
-        // We're too early in the initialization to use mutexes
-        LogConfiguration_lock = NULL;
-      }
-      MutexLockerEx ml(LogConfiguration_lock);
-      if (value == 0) {
-        LogConfiguration::parse_log_arguments("stdout", "gc=off", NULL, NULL, NULL);
-      } else {
-        LogConfiguration::parse_log_arguments("stdout", "gc", NULL, NULL, NULL);
-      }
-      LogConfiguration_lock = conf_mutex;
+    if (value == 0) {
+      LogConfiguration::parse_log_arguments("stdout", "gc=off", NULL, NULL, NULL);
+    } else {
+      LogConfiguration::parse_log_arguments("stdout", "gc", NULL, NULL, NULL);
     }
     break;
   case JVMTI_VERBOSE_JNI: