--- a/src/hotspot/share/gc/shared/collectorPolicy.cpp	Thu Feb 22 18:34:18 2018 +0100
+++ b/src/hotspot/share/gc/shared/collectorPolicy.cpp	Thu Feb 22 18:34:39 2018 +0100
@@ -151,10 +151,6 @@
   return result;
 }
 
-CardTableRS* CollectorPolicy::create_rem_set(MemRegion whole_heap) {
-  return new CardTableRS(whole_heap);
-}
-
 void CollectorPolicy::cleared_all_soft_refs() {
   _all_soft_refs_clear = true;
 }

--- a/src/hotspot/share/gc/shared/collectorPolicy.hpp	Thu Feb 22 18:34:18 2018 +0100
+++ b/src/hotspot/share/gc/shared/collectorPolicy.hpp	Thu Feb 22 18:34:39 2018 +0100
@@ -114,8 +114,6 @@
   // that the request in _should_clear_all_soft_refs has been fulfilled.
   virtual void cleared_all_soft_refs();
 
-  virtual CardTableRS* create_rem_set(MemRegion reserved);
-
   virtual MetaWord* satisfy_failed_metadata_allocation(ClassLoaderData* loader_data,
                                                        size_t size,
                                                        Metaspace::MetadataType mdtype);

--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp	Thu Feb 22 18:34:18 2018 +0100
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp	Thu Feb 22 18:34:39 2018 +0100
@@ -30,6 +30,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "code/codeCache.hpp"
 #include "code/icBuffer.hpp"
+#include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/gcId.hpp"
@@ -95,7 +96,7 @@
 
   initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
 
-  _rem_set = collector_policy()->create_rem_set(reserved_region());
+  _rem_set = new CardTableRS(reserved_region());
   set_barrier_set(rem_set()->bs());
 
   ReservedSpace young_rs = heap_rs.first_part(gen_policy()->young_gen_spec()->max_size(), false, false);