--- a/src/java.base/share/classes/module-info.java	Fri Jun 15 11:15:32 2018 -0700
+++ b/src/java.base/share/classes/module-info.java	Fri Jun 15 11:44:20 2018 -0700
@@ -152,8 +152,7 @@
         jdk.jartool,
         jdk.jfr,
         jdk.jlink,
-        jdk.scripting.nashorn,
-        jdk.internal.vm.ci;
+        jdk.scripting.nashorn;
     exports jdk.internal.org.objectweb.asm.tree to
         jdk.jfr,
         jdk.jlink;
@@ -182,7 +181,6 @@
         jdk.charsets,
         jdk.compiler,
         java.net.http,
-        jdk.jdeps,
         jdk.jfr,
         jdk.jlink,
         jdk.jshell,
@@ -212,11 +210,11 @@
         jdk.scripting.nashorn,
         jdk.unsupported;
     exports jdk.internal.vm to
-        jdk.management.agent,
-        jdk.internal.jvmstat;
+        jdk.internal.jvmstat,
+        jdk.management.agent;
     exports jdk.internal.vm.annotation to
-        jdk.unsupported,
-        jdk.internal.vm.ci;
+        jdk.internal.vm.ci,
+        jdk.unsupported;
     exports jdk.internal.util.jar to
         jdk.jartool;
     exports jdk.internal.util.xml to
@@ -260,8 +258,7 @@
         java.management,
         java.management.rmi,
         java.rmi,
-        java.sql.rowset,
-        java.xml;
+        java.sql.rowset;
     exports sun.security.action to
         java.desktop,
         java.security.jgss;
@@ -312,12 +309,9 @@
     exports sun.security.x509 to
         jdk.crypto.ec,
         jdk.crypto.cryptoki,
-        jdk.jartool,
-        jdk.security.auth;
+        jdk.jartool;
     exports sun.security.validator to
         jdk.jartool;
-    exports sun.text.resources to
-        jdk.localedata;
     exports sun.util.cldr to
         jdk.jlink;
     exports sun.util.locale.provider to