--- old/src/hotspot/share/classfile/classLoaderData.hpp	2018-03-14 14:35:03.944781000 +0100
+++ new/src/hotspot/share/classfile/classLoaderData.hpp	2018-03-14 14:35:03.519745000 +0100
@@ -264,11 +264,6 @@
   // Support for walking class loader data objects
   ClassLoaderData* _next; /// Next loader_datas created
 
-  // ReadOnly and ReadWrite metaspaces (static because only on the null
-  // class loader for now).
-  static ClassLoaderMetaspace* _ro_metaspace;
-  static ClassLoaderMetaspace* _rw_metaspace;
-
   TRACE_DEFINE_TRACE_ID_FIELD;
 
   void set_next(ClassLoaderData* next) { _next = next; }
@@ -316,7 +311,7 @@
   bool is_alive(BoolObjectClosure* is_alive_closure) const;
 
   // Accessors
-  ClassLoaderMetaspace* metaspace_or_null() const     { return _metaspace; }
+  ClassLoaderMetaspace* metaspace_or_null() const { return _metaspace; }
 
   static ClassLoaderData* the_null_class_loader_data() {
     return _the_null_class_loader_data;