--- old/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	2018-11-05 01:59:15.869280551 -0500
+++ new/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	2018-11-05 01:59:14.389196153 -0500
@@ -1253,12 +1253,6 @@
                 throw new IllegalArgumentException(cn + " not in same package as lookup class: " + lookupClass.getName());
             }
 
-            Class<?> host = lookupClass;
-            if ((flags & NESTMATE_CLASS) != 0) {
-                // cached in the Class object
-                host = lookupClass.getNestHost();
-            }
-
             if ((flags & NONFINDABLE_CLASS) != 0) {
                 // assign a new name
                 // cn = cn + "\\" + ++seq;
@@ -1268,7 +1262,7 @@
             // invoke the class loader's defineClass method
             ClassLoader loader = lookupClass.getClassLoader();
             ProtectionDomain pd = (loader != null) ? lookupClassProtectionDomain() : null;
-            Class<?> clazz = JLA.defineClass(loader, host, cn, bytes, pd, flags, classData);
+            Class<?> clazz = JLA.defineClass(loader, lookupClass, cn, bytes, pd, flags, classData);
             assert clazz.getClassLoader() == lookupClass.getClassLoader()
                    && clazz.getPackageName().equals(lookupClass.getPackageName());