--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java	Tue Apr 24 08:13:30 2018 -0700
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java	Tue Apr 24 09:04:57 2018 -0700
@@ -22,19 +22,16 @@
  */
 package org.graalvm.compiler.replacements.classfile;
 
-import static org.graalvm.compiler.serviceprovider.JDK9Method.getModule;
-import static org.graalvm.compiler.serviceprovider.JDK9Method.getResourceAsStream;
-
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.collections.Equivalence;
+import jdk.internal.vm.compiler.collections.EconomicMap;
+import jdk.internal.vm.compiler.collections.Equivalence;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.bytecode.Bytecode;
 import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.serviceprovider.JDK9Method;
+import org.graalvm.compiler.serviceprovider.GraalServices;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -98,20 +95,6 @@
         return false;
     }
 
-    private static InputStream getClassfileAsStream(Class<?> c) {
-        String classfilePath = c.getName().replace('.', '/') + ".class";
-        if (JDK9Method.JAVA_SPECIFICATION_VERSION >= 9) {
-            Object module = getModule(c);
-            return getResourceAsStream(module, classfilePath);
-        } else {
-            ClassLoader cl = c.getClassLoader();
-            if (cl == null) {
-                return ClassLoader.getSystemResourceAsStream(classfilePath);
-            }
-            return cl.getResourceAsStream(classfilePath);
-        }
-    }
-
     /**
      * Gets a {@link Classfile} created by parsing the class file bytes for {@code c}.
      *
@@ -123,7 +106,7 @@
         if (classfile == null) {
             try {
                 ResolvedJavaType type = metaAccess.lookupJavaType(c);
-                InputStream in = getClassfileAsStream(c);
+                InputStream in = GraalServices.getClassfileAsStream(c);
                 if (in != null) {
                     DataInputStream stream = new DataInputStream(in);
                     classfile = new Classfile(type, stream, this);