diff -r f14423456446 -r 27c0007bb28d langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Fri May 27 14:45:20 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Fri May 27 19:45:57 2016 -0400
@@ -128,7 +128,6 @@
     private final boolean allowModules;
 
     public final boolean multiModuleMode;
-    public final boolean noModules;
 
     private final String moduleOverride;
 
@@ -167,10 +166,6 @@
 
         moduleOverride = options.get(Option.XMODULE);
 
-        // The following is required, for now, to support building
-        // Swing beaninfo via javadoc.
-        noModules = options.isSet("noModules");
-
         multiModuleMode = fileManager.hasLocation(StandardLocation.MODULE_SOURCE_PATH);
         ClassWriter classWriter = ClassWriter.instance(context);
         classWriter.multiModuleMode = multiModuleMode;
@@ -194,7 +189,7 @@
     }
 
     public boolean enter(List<JCCompilationUnit> trees, ClassSymbol c) {
-        if (!allowModules || noModules) {
+        if (!allowModules) {
             for (JCCompilationUnit tree: trees) {
                 tree.modle = syms.noModule;
             }