diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
index 203fab20e547..25805ab30b13 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
@@ -46,6 +46,7 @@ import com.intellij.openapi.ui.InputValidator;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -82,6 +83,9 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
   public static final String TESTS_EXTERNAL_COMPILER_HOME_PROPERTY_NAME = "tests.external.compiler.home";
   public static final int DEFAULT_BUILD_PROCESS_HEAP_SIZE = 700;
 
+  private static final List<String> DEFAULT_WILDCARD_PATTERNS =
+    Arrays.asList("!?*.java", "!?*.form", "!?*.class", "!?*.groovy", "!?*.scala", "!?*.flex", "!?*.kt", "!?*.clj", "!?*.aj");
+
   private BackendCompiler myDefaultJavaCompiler;
   private State myState = new State();
 
@@ -167,10 +171,12 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
       addChild(newChild, JpsJavaCompilerConfigurationSerializer.ENTRY).setAttribute(JpsJavaCompilerConfigurationSerializer.NAME, pattern);
     }
 
-    if (myWildcardPatternsInitialized || !myWildcardPatterns.isEmpty()) {
+    if ((myWildcardPatternsInitialized || !myWildcardPatterns.isEmpty()) &&
+        (!Registry.is("saving.state.in.new.format.is.allowed", false) || !DEFAULT_WILDCARD_PATTERNS.equals(myWildcardPatterns))) {
       final Element wildcardPatterns = addChild(state, JpsJavaCompilerConfigurationSerializer.WILDCARD_RESOURCE_PATTERNS);
       for (final String wildcardPattern : myWildcardPatterns) {
-        addChild(wildcardPatterns, JpsJavaCompilerConfigurationSerializer.ENTRY).setAttribute(JpsJavaCompilerConfigurationSerializer.NAME, wildcardPattern);
+        addChild(wildcardPatterns, JpsJavaCompilerConfigurationSerializer.ENTRY)
+          .setAttribute(JpsJavaCompilerConfigurationSerializer.NAME, wildcardPattern);
       }
     }
 
@@ -291,15 +297,9 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
       removeWildcardPatterns();
     }
     try {
-      addWildcardResourcePattern("!?*.java");
-      addWildcardResourcePattern("!?*.form");
-      addWildcardResourcePattern("!?*.class");
-      addWildcardResourcePattern("!?*.groovy");
-      addWildcardResourcePattern("!?*.scala");
-      addWildcardResourcePattern("!?*.flex");
-      addWildcardResourcePattern("!?*.kt");
-      addWildcardResourcePattern("!?*.clj");
-      addWildcardResourcePattern("!?*.aj");
+      for (String pattern : DEFAULT_WILDCARD_PATTERNS) {
+        addWildcardResourcePattern(pattern);
+      }
     }
     catch (MalformedPatternException e) {
       LOG.error(e);
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index e57a5f99d5d3..fecf1b244100 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -691,6 +691,7 @@ ruby.remote.debugger.supports.catchpoint.removal=true
 
 use.read.action.to.init.service=false
 use.loaded.state.as.existing=true
+saving.state.in.new.format.is.allowed=false
 
 ide.mac.new.color.picker=false