diff --git a/platform/vcs-api/intellij.platform.vcs.iml b/platform/vcs-api/intellij.platform.vcs.iml
index 93f4ab864831..4664c63f4233 100644
--- a/platform/vcs-api/intellij.platform.vcs.iml
+++ b/platform/vcs-api/intellij.platform.vcs.iml
@@ -15,5 +15,6 @@
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
index 870f2dac3d5e..f69336ab3d5c 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
@@ -22,10 +22,7 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ThreeState;
 import com.intellij.util.ui.VcsSynchronousProgressWrapper;
-import org.jetbrains.annotations.CalledInAwt;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.*;
 
 import java.util.Collections;
 import java.util.List;
@@ -428,6 +425,11 @@ public abstract class AbstractVcs<ComList extends CommittedChangeList> extends S
     List<VirtualFile> convertRoots(@NotNull List<VirtualFile> result);
   }
 
+  @ApiStatus.Internal
+  public boolean needsLegacyDefaultMappings() {
+    return false;
+  }
+
   /**
    * Returns the implementation of the merge provider which is used to load the revisions to be merged
    * for a particular file.
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
index 8dd8a8c20d24..494fbc7e92d9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
@@ -293,6 +293,8 @@ public class NewMappings implements Disposable {
                                                         @NotNull Collection<VirtualFile> projectRoots,
                                                         @NotNull Set<VirtualFile> mappedDirs) {
     try {
+      if (vcs.needsLegacyDefaultMappings()) return projectRoots;
+
       DirectoryIndex directoryIndex = DirectoryIndex.getInstance(myProject);
       VcsRootChecker rootChecker = myVcsManager.getRootChecker(vcs);