--- old/src/share/vm/gc/cms/parOopClosures.inline.hpp	2017-09-06 11:32:19.194999575 -0400
+++ new/src/share/vm/gc/cms/parOopClosures.inline.hpp	2017-09-06 11:32:18.950382379 -0400
@@ -126,9 +126,7 @@
           (void)_par_scan_state->trim_queues(10 * ParallelGCThreads);
         }
       }
-      if (is_scanning_a_klass()) {
-        do_klass_barrier();
-      } else if (gc_barrier) {
+      if (gc_barrier) {
         // Now call parent closure
         par_do_barrier(p);
       }