--- old/src/share/vm/memory/genCollectedHeap.cpp	2015-04-02 12:27:32.660335269 +0200
+++ new/src/share/vm/memory/genCollectedHeap.cpp	2015-04-02 12:27:32.548335273 +0200
@@ -118,8 +118,7 @@
   initialize_reserved_region((HeapWord*)heap_rs.base(), (HeapWord*)(heap_rs.base() + heap_rs.size()));
 
   _rem_set = collector_policy()->create_rem_set(reserved_region());
-  _barrier_set = rem_set()->bs();
-  oopDesc::set_bs(_barrier_set);
+  set_barrier_set(rem_set()->bs());
 
   _gch = this;