diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 8d5f51f2750..ee26bf8d919 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -540,20 +540,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
 
                 val targetDirtyFiles = dirtyFilesHolder.byTarget[jpsTarget]
                 if (cache != null && targetDirtyFiles != null) {
-                    val dirtyFiles = targetDirtyFiles.dirty.keys + targetDirtyFiles.removed
-                    val complementaryFiles = cache.getComplementaryFilesRecursive(dirtyFiles)
+                    val complementaryFiles = cache.getComplementaryFilesRecursive(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed)
 
-                    // Get all parts of @JvmMultifileClass file for simultaneous rebuild
-                    var dirtyMultifileClassFiles: Collection<File> = emptyList()
-                    if (cache is IncrementalJvmCache) {
-                        dirtyMultifileClassFiles = cache.classesBySources(dirtyFiles)
-                            .filter { cache.isMultifileFacade(it) }
-                            .flatMap { cache.getAllPartsOfMultifileFacade(it).orEmpty() }
-                            .flatMap { cache.sourcesByInternalName(it) }
-                            .distinct()
-                            .filter { !dirtyFiles.contains(it) }
-                    }
-                    fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles + dirtyMultifileClassFiles)
+                    fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles)
 
                     cache.markDirty(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed)
                 }
diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
index 0a37a7011af..5ab0e5a89b3 100644
--- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
+++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log
@@ -3,10 +3,8 @@
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
   out/production/module/test/Test.class
-  out/production/module/test/Test__BKt.class
-End of files
-Cleaning output files:
   out/production/module/test/Test__AKt.class
+  out/production/module/test/Test__BKt.class
 End of files
 Compiling files:
   src/a.kt
diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log
index b9ec7f67acd..ff973ffb2dc 100644
--- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log
+++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log
@@ -3,10 +3,8 @@
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
   out/production/module/test/Test.class
-  out/production/module/test/Test__BKt.class
-End of files
-Cleaning output files:
   out/production/module/test/Test__AKt.class
+  out/production/module/test/Test__BKt.class
 End of files
 Compiling files:
   src/a.kt
diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
index d2f88033cbb..8326f0654d7 100644
--- a/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
+++ b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log
@@ -3,10 +3,8 @@
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
   out/production/module/Utils.class
-  out/production/module/Utils__PartBKt.class
-End of files
-Cleaning output files:
   out/production/module/Utils__PartAKt.class
+  out/production/module/Utils__PartBKt.class
   out/production/module/Utils__PartCKt.class
 End of files
 Compiling files:
diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
index 2894c2c0a84..f20d8533f5f 100644
--- a/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
+++ b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log
@@ -3,10 +3,8 @@
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
   out/production/module/Utils.class
-  out/production/module/Utils__PartBKt.class
-End of files
-Cleaning output files:
   out/production/module/Utils__PartAKt.class
+  out/production/module/Utils__PartBKt.class
 End of files
 Compiling files:
   src/partA.kt