diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
index bb481077fd62..0e08bcbadf64 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
@@ -374,6 +374,11 @@ public class CvsVcs2 extends AbstractVcs<CvsChangeList> implements TransactionPr
     };
   }
 
+  @Override
+  public boolean needsLegacyDefaultMappings() {
+    return true;
+  }
+
   @Override
   public MergeProvider getMergeProvider() {
     if (myMergeProvider != null) {