diff --git a/build.gradle.kts b/build.gradle.kts
index 5e7a518629a..cf64d995533 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,7 +32,6 @@ buildscript {
 plugins {
     base
     idea
-    id("jps-compatible")
     id("org.jetbrains.gradle.plugin.idea-ext") version "1.0.1" // this version should be in sync with repo/buildsrc-compat/build.gradle.kts
     id("build-time-report")
     id("java-instrumentation")
@@ -50,15 +49,6 @@ plugins {
     }
 }
 
-pill {
-    excludedDirs(
-        "out",
-        "buildSrc/build",
-        "buildSrc/prepare-deps/intellij-sdk/build",
-        "intellij"
-    )
-}
-
 val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
 
 val defaultSnapshotVersion: String by extra
diff --git a/plugins/pill/pill-importer/src/ModelParser.kt b/plugins/pill/pill-importer/src/ModelParser.kt
index 743746851de..ccc069774fa 100644
--- a/plugins/pill/pill-importer/src/ModelParser.kt
+++ b/plugins/pill/pill-importer/src/ModelParser.kt
@@ -39,7 +39,7 @@ class ModelParser(private val modulePrefix: String, private val globalExcludedDi
         }
 
         val (includedProjects, excludedProjects) = project.allprojects
-            .partition { it.plugins.hasPlugin("jps-compatible") }
+            .partition { it == project || it.plugins.hasPlugin("jps-compatible") }
 
         val modules = includedProjects.flatMap { parseModules(it, excludedProjects) }
         val artifacts = parseArtifacts(project)