--- old/src/hotspot/share/gc/g1/g1FullCollector.cpp	2018-02-26 10:50:59.663288930 +0100
+++ new/src/hotspot/share/gc/g1/g1FullCollector.cpp	2018-02-26 10:50:59.359276887 +0100
@@ -199,7 +199,8 @@
   scope()->tracer()->report_object_count_after_gc(&_is_alive);
 }
 
-void G1FullCollector::prepare_compaction_common() {
+void G1FullCollector::phase2_prepare_compaction() {
+  GCTraceTime(Info, gc, phases) info("Phase 2: Prepare for compaction", scope()->timer());
   G1FullGCPrepareTask task(this);
   run_task(&task);
 
@@ -209,11 +210,6 @@
   }
 }
 
-void G1FullCollector::phase2_prepare_compaction() {
-  GCTraceTime(Info, gc, phases) info("Phase 2: Prepare for compaction", scope()->timer());
-  prepare_compaction_ext(); // Will call prepare_compaction_common() above.
-}
-
 void G1FullCollector::phase3_adjust_pointers() {
   // Adjust the pointers to reflect the new locations
   GCTraceTime(Info, gc, phases) info("Phase 3: Adjust pointers and remembered sets", scope()->timer());