--- old/test/tools/jar/modularJar/Basic.java	2016-06-22 11:14:23.000000000 -0700
+++ new/test/tools/jar/modularJar/Basic.java	2016-06-22 11:14:23.000000000 -0700
@@ -831,12 +831,13 @@
 
         List<String> commands = new ArrayList<>();
         commands.add(java);
-        if (!VM_OPTIONS.isEmpty()) {
-            commands.addAll(Arrays.asList(VM_OPTIONS.split("\\s+", -1)));
-        }
-        if (!JAVA_OPTIONS.isEmpty()) {
-            commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
-        }
+        //temporarily commenting out options for 8158855
+        //if (!VM_OPTIONS.isEmpty()) {
+        //    commands.addAll(Arrays.asList(VM_OPTIONS.split("\\s+", -1)));
+        //}
+        //if (!JAVA_OPTIONS.isEmpty()) {
+        //    commands.addAll(Arrays.asList(JAVA_OPTIONS.split("\\s+", -1)));
+        //}
         Stream.of(args).forEach(x -> commands.add(x));
         commands.add("-mp");
         commands.add(modulePath.toString());