--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Tue Mar 29 10:24:30 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/SourceCodeAnalysisImpl.java	Fri Apr 01 09:20:33 2016 -0700
@@ -258,7 +258,7 @@
         OuterWrap codeWrap;
         switch (guessKind(code)) {
             case IMPORT:
-                codeWrap = OuterWrap.wrapImport(null, Wrap.importWrap(code + "any.any"));
+                codeWrap = OuterWrap.wrapImport(null, Wrap.simpleWrap(code + "any.any"));
                 break;
             case METHOD:
                 codeWrap = wrapInClass(Wrap.classMemberWrap(code));