--- a/jdk/src/jdk.rmic/share/classes/sun/tools/javac/Main.java	Tue Nov 18 15:25:16 2014 -0800
+++ b/jdk/src/jdk.rmic/share/classes/sun/tools/javac/Main.java	Wed Dec 03 14:22:58 2014 +0000
@@ -197,7 +197,6 @@
         String sourcePathArg = null;
         String classPathArg = null;
         String sysClassPathArg = null;
-        String extDirsArg = null;
         boolean verbosePath = false;
 
         String targetArg = null;
@@ -342,17 +341,6 @@
                     usage_error();
                     return false;  // Stop processing now
                 }
-            } else if (argv[i].equals("-extdirs")) {
-                if ((i + 1) < argv.length) {
-                    if (extDirsArg != null) {
-                        error("main.option.already.seen","-extdirs");
-                    }
-                    extDirsArg = argv[++i];
-                } else {
-                    error("main.option.requires.argument","-extdirs");
-                    usage_error();
-                    return false;  // Stop processing now
-                }
             } else if (argv[i].equals("-encoding")) {
                 if ((i + 1) < argv.length) {
                     if (encoding!=null)
@@ -475,8 +463,7 @@
         BatchEnvironment env = BatchEnvironment.create(out,
                                                        sourcePathArg,
                                                        classPathArg,
-                                                       sysClassPathArg,
-                                                       extDirsArg);
+                                                       sysClassPathArg);
         if (verbosePath) {
             output(getText("main.path.msg",
                            env.sourcePath.toString(),
@@ -503,7 +490,7 @@
             for (Enumeration<String> e = v.elements() ; e.hasMoreElements() ;) {
                 File file = new File(e.nextElement());
                 try {
-                    env.parseFile(new ClassFile(file));
+                    env.parseFile(ClassFile.newClassFile(file));
                 } catch (FileNotFoundException ee) {
                     env.error(0, "cant.read", file.getPath());
                     exitStatus = EXIT_CMDERR;