--- a/hotspot/src/share/vm/oops/klass.cpp	Tue Aug 08 08:41:36 2017 -0400
+++ b/hotspot/src/share/vm/oops/klass.cpp	Tue Aug 08 09:53:52 2017 -0400
@@ -559,7 +559,7 @@
       module_entry = ModuleEntryTable::javabase_moduleEntry();
     }
     // Obtain java.lang.Module, if available
-    Handle module_handle(THREAD, ((module_entry != NULL) ? JNIHandles::resolve(module_entry->module()) : (oop)NULL));
+    Handle module_handle(THREAD, ((module_entry != NULL) ? module_entry->module() : (oop)NULL));
     java_lang_Class::create_mirror(this, loader, module_handle, protection_domain, CHECK);
   }
 }