--- a/src/hotspot/share/gc/g1/g1RootClosures.cpp	Sun Mar 04 22:24:06 2018 -0800
+++ b/src/hotspot/share/gc/g1/g1RootClosures.cpp	Mon Mar 05 11:16:23 2018 +0100
@@ -111,11 +111,7 @@
 };
 
 G1EvacuationRootClosures* G1EvacuationRootClosures::create_root_closures(G1ParScanThreadState* pss, G1CollectedHeap* g1h) {
-  G1EvacuationRootClosures* res = create_root_closures_ext(pss, g1h);
-  if (res != NULL) {
-    return res;
-  }
-
+  G1EvacuationRootClosures* res = NULL;
   if (g1h->collector_state()->during_initial_mark_pause()) {
     if (ClassUnloadingWithConcurrentMark) {
       res = new G1InitialMarkClosures<G1MarkPromotedFromRoot>(g1h, pss);

--- a/src/hotspot/share/gc/g1/g1RootClosures.hpp	Sun Mar 04 22:24:06 2018 -0800
+++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp	Mon Mar 05 11:16:23 2018 +0100
@@ -48,7 +48,6 @@
 };
 
 class G1EvacuationRootClosures : public G1RootClosures {
-  static G1EvacuationRootClosures* create_root_closures_ext(G1ParScanThreadState* pss, G1CollectedHeap* g1h);
 public:
   // Flush any buffered state and deferred processing
   virtual void flush() = 0;

--- a/src/hotspot/share/gc/g1/g1RootClosures_ext.cpp	Sun Mar 04 22:24:06 2018 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#include "precompiled.hpp"
-#include "gc/g1/g1RootClosures.hpp"
-
-G1EvacuationRootClosures* G1EvacuationRootClosures::create_root_closures_ext(G1ParScanThreadState* pss, G1CollectedHeap* g1h) {
-  return NULL;
-}