--- old/src/hotspot/share/classfile/classLoaderData.cpp	2018-09-21 10:57:12.299462614 -0400
+++ new/src/hotspot/share/classfile/classLoaderData.cpp	2018-09-21 10:57:12.027462603 -0400
@@ -605,9 +605,10 @@
   // if they are not already on the _klasses list.
   free_deallocate_list_C_heap_structures();
 
-  // Tell serviceability tools these classes are unloading
+  // Clean up class dependencies and tell serviceability tools
+  // these classes are unloading.  Must be called
   // after erroneous classes are released.
-  classes_do(InstanceKlass::notify_unload_class);
+  classes_do(InstanceKlass::unload_class);
 
   // Clean up global class iterator for compiler
   static_klass_iterator.adjust_saved_class(this);