--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed Jun 11 12:09:12 2014 +0200
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed Jun 11 09:58:23 2014 -0400
@@ -4667,9 +4667,7 @@
 }
 
 bool ClassFileParser::is_supported_version(u2 major, u2 minor) {
-  u2 max_version =
-    JDK_Version::is_gte_jdk17x_version() ? JAVA_MAX_SUPPORTED_VERSION :
-    (JDK_Version::is_gte_jdk16x_version() ? JAVA_6_VERSION : JAVA_1_5_VERSION);
+  u2 max_version = JAVA_MAX_SUPPORTED_VERSION;
   return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
          (major <= max_version) &&
          ((major != max_version) ||