--- old/src/hotspot/share/prims/jvmtiTagMap.cpp	2017-09-25 13:09:38.243161531 -0400
+++ new/src/hotspot/share/prims/jvmtiTagMap.cpp	2017-09-25 13:09:37.713001734 -0400
@@ -3026,8 +3026,7 @@
   // Preloaded classes and loader from the system dictionary
   blk.set_kind(JVMTI_HEAP_REFERENCE_SYSTEM_CLASS);
   SystemDictionary::always_strong_oops_do(&blk);
-  KlassToOopClosure klass_blk(&blk);
-  ClassLoaderDataGraph::always_strong_oops_do(&blk, &klass_blk, false);
+  ClassLoaderDataGraph::always_strong_oops_do(&blk, false);
   if (blk.stopped()) {
     return false;
   }