--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp	Mon Apr 25 11:36:14 2016 +0200
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap_ext.cpp	Wed Apr 20 15:24:18 2016 +0200
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
+#include "gc/g1/g1DefaultPolicy.hpp"
 #include "gc/g1/g1ParScanThreadState.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
 
@@ -40,5 +41,5 @@
 }
 
 G1Policy* G1CollectedHeap::create_g1_policy() {
-  return new G1Policy;
+  return new G1DefaultPolicy();
 }