--- a/src/hotspot/share/classfile/classLoaderData.cpp	Tue Jun 26 13:50:59 2018 -0700
+++ b/src/hotspot/share/classfile/classLoaderData.cpp	Tue Jun 26 16:59:38 2018 -0400
@@ -832,9 +832,7 @@
   oop* ptr = h.ptr_raw();
   if (ptr != NULL) {
     assert(_handles.owner_of(ptr), "Got unexpected handle " PTR_FORMAT, p2i(ptr));
-    // This root is not walked in safepoints, and hence requires an appropriate
-    // decorator that e.g. maintains the SATB invariant in SATB collectors.
-    NativeAccess<IN_CONCURRENT_ROOT>::oop_store(ptr, oop(NULL));
+    NativeAccess<>::oop_store(ptr, oop(NULL));
   }
 }