--- old/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	2016-08-24 10:18:03.000000000 -0700
+++ new/modules/jdk.packager/src/main/java/com/sun/javafx/tools/packager/DeployParams.java	2016-08-24 10:18:02.000000000 -0700
@@ -120,7 +120,7 @@
     //list of HTML templates to process
     List<Template> templates = new LinkedList<>();
 
-    String jrePlatform = "1.8+";
+    String jrePlatform = PackagerLib.JAVAFX_VERSION+"+";
     String fxPlatform = PackagerLib.JAVAFX_VERSION+"+";
     File javaRuntimeToUse = null;
     boolean javaRuntimeWasSet = false;
@@ -509,7 +509,7 @@
 
         // Success
         if (applicationClass != null && !applicationClass.isEmpty() &&
-            (getBundleType() == BundleType.JNLP || getBundleType() == BundleType.ALL)) {
+            (getBundleType() == BundleType.JNLP)) {
             result = true;
         }