--- old/src/share/vm/gc/parallel/psTasks.cpp	2017-09-06 11:33:38.144513430 -0400
+++ new/src/share/vm/gc/parallel/psTasks.cpp	2017-09-06 11:33:37.894300494 -0400
@@ -78,10 +78,7 @@
       break;
 
     case class_loader_data:
-    {
-      PSScavengeKlassClosure klass_closure(pm);
-      ClassLoaderDataGraph::oops_do(&roots_closure, &klass_closure, false);
-    }
+      ClassLoaderDataGraph::oops_do(&roots_closure, false);
     break;
 
     case management: