--- old/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java	2014-11-20 16:03:51.772397786 +0000
+++ new/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java	2014-11-20 16:03:51.600386141 +0000
@@ -48,12 +48,6 @@
         String testclasses = System.getProperty("test.classes");
         String userDir = System.getProperty("user.dir");
 
-        if (javahome.regionMatches(true, javahome.length() - 4,
-                                   File.separator + "jre", 0, 4))
-        {
-            javahome = javahome.substring(0, javahome.length() - 4);
-        }
-
         Process javacProcess = Runtime.getRuntime().exec(
             javahome + File.separator + "bin" + File.separator +
             "javac -d " + testclasses + " " +