--- a/src/hotspot/share/gc/serial/markSweep.inline.hpp	Fri Dec 07 13:59:19 2018 -0500
+++ b/src/hotspot/share/gc/serial/markSweep.inline.hpp	Fri Dec 07 14:48:35 2018 -0500
@@ -57,7 +57,7 @@
 }
 
 inline void MarkSweep::follow_klass(Klass* klass) {
-  oop op = klass->klass_holder();
+  oop op = klass->class_loader_data()->holder_no_keepalive();
   MarkSweep::mark_and_push(&op);
 }