--- a/src/share/bin/java.c	Sat Feb 20 01:41:15 2016 +0000
+++ b/src/share/bin/java.c	Sat Feb 20 01:42:40 2016 +0000
@@ -699,22 +699,6 @@
     }
 }
 
-/*
- * This is called if the jvmtype returned by CheckJvmType above
- * didn't exist. In this case if it was the default VM and we
- * selected the server vm we will allow it to use the client vm
- * instead.
- */
-char *
-GetAltJvmType(char *jvmtype)
-{
-    if ((knownVMs[0].flag == VM_IF_SERVER_CLASS)) {
-        if (jvmtype == knownVMs[0].server_class+1) return knownVMs[0].name+1;
-        if (jvmtype == knownVMs[0].name+1) return knownVMs[0].server_class+1;
-    }
-    return NULL;
-}
-
 /* copied from HotSpot function "atomll()" */
 static int
 parse_size(const char *s, jlong *result) {

--- a/src/share/bin/java.h	Sat Feb 20 01:41:15 2016 +0000
+++ b/src/share/bin/java.h	Sat Feb 20 01:42:40 2016 +0000
@@ -164,7 +164,6 @@
  */
 jint ReadKnownVMs(const char *jvmcfg, jboolean speculative);
 char *CheckJvmType(int *argc, char ***argv, jboolean speculative);
-char *GetAltJvmType(char *jvmtype);
 void AddOption(char *str, void *info);
 
 enum ergo_policy {

--- a/src/solaris/bin/aarch64/jvm.cfg	Sat Feb 20 01:41:15 2016 +0000
+++ b/src/solaris/bin/aarch64/jvm.cfg	Sat Feb 20 01:42:40 2016 +0000
@@ -31,6 +31,5 @@
 # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
 # and may not be available in a future release.
 #
--client IF_SERVER_CLASS -server
 -server KNOWN
--minimal KNOWN
+-client IGNORE

--- a/src/solaris/bin/java_md_solinux.c	Sat Feb 20 01:41:15 2016 +0000
+++ b/src/solaris/bin/java_md_solinux.c	Sat Feb 20 01:42:40 2016 +0000
@@ -474,17 +474,8 @@
         }
 
         if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0 )) {
-          char *altjvmtype = GetAltJvmType(jvmtype);
-          jboolean found = JNI_FALSE;
-          if (altjvmtype) {
-            jvmtype = altjvmtype;
-            jvmpath[0] = '\0';
-            found = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0) != NULL;
-          }
-          if (!found) {
-	    JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
-	    exit(4);
-          }
+          JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath);
+          exit(4);
         }
         /*
          * we seem to have everything we need, so without further ado