--- old/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java	2016-07-15 00:13:45.017683717 -0700
+++ new/src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java	2016-07-15 00:13:44.928681463 -0700
@@ -223,7 +223,6 @@
                     new WrapSourceHandler(),
                     Util.join(new String[] {
                         "-Xshouldstop:at=FLOW", "-Xlint:unchecked",
-                        "-XaddExports:jdk.jshell/jdk.internal.jshell.remote=ALL-UNNAMED",
                         "-proc:none"
                     }, extraArgs));
         }
@@ -267,7 +266,7 @@
 
         CompileTask(final Collection<OuterWrap> wraps) {
             super(wraps.stream(), new WrapSourceHandler(),
-                    "-Xlint:unchecked", "-XaddExports:jdk.jshell/jdk.internal.jshell.remote=ALL-UNNAMED", "-proc:none", "-parameters");
+                    "-Xlint:unchecked", "-proc:none", "-parameters");
         }
 
         boolean compile() {
@@ -286,7 +285,7 @@
             }
             List<String> list = new ArrayList<>();
             for (OutputMemoryJavaFileObject fo : l) {
-                state.setClassnameToBytes(fo.getName(), fo.getBytes());
+                state.classTracker.setCurrentBytes(fo.getName(), fo.getBytes());
                 list.add(fo.getName());
             }
             return list;