diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/DumbMappings.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/DumbMappings.java
deleted file mode 100644
index ff8d3b0ffa61..000000000000
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/DumbMappings.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.jps.builders.java.dependencyView;
-
-import java.io.File;
-import java.io.PrintStream;
-
-public final class DumbMappings extends Mappings {
-  @Override
-  public void flush(boolean memoryCachesOnly) {}
-
-  @Override
-  public void toStream(File outputRoot) {}
-
-  @Override
-  public void toStream(PrintStream stream) {}
-}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
index 26c90e11eced..a74a5c106c3a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
@@ -128,20 +128,6 @@ public class Mappings {
     myObjectClassName = myContext.get("java/lang/Object");
   }
 
-  public Mappings() {
-    myLock = new Object();
-    myIsDelta = false;
-    myChangedClasses = null;
-    myChangedFiles = null;
-    myDeletedClasses = null;
-    myAddedClasses = null;
-    myRootDir = null;
-    myRelativizer = null;
-    myInitName = 1;
-    myEmptyName = 0;
-    myObjectClassName = -1;
-  }
-
   private void createImplementation() throws IOException {
     try {
       if (!myIsDelta) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
index bded1eac48bf..0bbb92ac1ffd 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
@@ -11,7 +11,6 @@ import org.jetbrains.jps.builders.BuildTargetType;
 import org.jetbrains.jps.builders.impl.BuildTargetChunk;
 import org.jetbrains.jps.builders.impl.storage.BuildTargetStorages;
 import org.jetbrains.jps.builders.java.JavaBuilderUtil;
-import org.jetbrains.jps.builders.java.dependencyView.DumbMappings;
 import org.jetbrains.jps.builders.java.dependencyView.Mappings;
 import org.jetbrains.jps.builders.storage.BuildDataCorruptedException;
 import org.jetbrains.jps.builders.storage.BuildDataPaths;
@@ -82,12 +81,7 @@ public final class BuildDataManager {
       myOutputToTargetRegistry = new OutputToTargetRegistry(new File(getOutputToSourceRegistryRoot(), "data"), relativizer);
       File mappingsRoot = getMappingsRoot(myDataPaths.getDataStorageRoot());
       if (JavaBuilderUtil.isDepGraphEnabled()) {
-        if(Boolean.parseBoolean(System.getProperty("kotlin.jps.workaround.tests", "false"))) {
-          myMappings = new DumbMappings();
-        }
-        else {
-          myMappings = null;
-        }
+        myMappings = null;
         createDependencyGraph(mappingsRoot, false);
         LOG.info("Using DependencyGraph-based build incremental analysis");
       }
diff --git a/plugins/kotlin/jps/graphImplementationTests/tests/org/jetbrains/kotlin/jpsGraph/test/IncrementalK2JvmJpsTestGenerated.java b/plugins/kotlin/jps/graphImplementationTests/tests/org/jetbrains/kotlin/jpsGraph/test/IncrementalK2JvmJpsTestGenerated.java
index 721c2cf64a6b..304b656cc2fe 100644
--- a/plugins/kotlin/jps/graphImplementationTests/tests/org/jetbrains/kotlin/jpsGraph/test/IncrementalK2JvmJpsTestGenerated.java
+++ b/plugins/kotlin/jps/graphImplementationTests/tests/org/jetbrains/kotlin/jpsGraph/test/IncrementalK2JvmJpsTestGenerated.java
@@ -25,8 +25,6 @@ import static org.jetbrains.kotlin.config.IncrementalCompilation.INCREMENTAL_COM
 @TestRoot("jps/graphImplementationTests/testData/incremental")
 public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJpsTest {
     static void setUpTests() {
-        System.setProperty("kotlin.jps.workaround.tests", "true");
-
         //// Use custom compiler for tests
         //File distJar = KotlinArtifactsDownloader.INSTANCE.downloadArtifactForIdeFromSources(
         //        "kotlin-dist-for-ide",