diff --git a/libraries/examples/annotation-processor-example/build.gradle.kts b/libraries/examples/annotation-processor-example/build.gradle.kts
index a1df51936b2..8ce00d03aa6 100644
--- a/libraries/examples/annotation-processor-example/build.gradle.kts
+++ b/libraries/examples/annotation-processor-example/build.gradle.kts
@@ -1,15 +1,8 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 description = "Simple Annotation Processor for testing kapt"
 
 plugins {
     kotlin("jvm")
     `maven-publish` // only used for installing to mavenLocal()
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
index 177c3e87b46..e3a67e0f19d 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
+++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id("java-gradle-plugin")
     id("org.jetbrains.kotlin.jvm")
     id("com.gradle.plugin-publish")
-    id("jps-compatible")
     id("maven-publish")
 }
 
@@ -13,10 +12,6 @@ repositories {
     mavenCentral()
 }
 
-pill {
-    variant = 'FULL'
-}
-
 dependencies {
     api project(':kotlin-gradle-plugin-api')
     // Use this dependency instead when building apart from the other modules:
diff --git a/libraries/tools/atomicfu/build.gradle.kts b/libraries/tools/atomicfu/build.gradle.kts
index 9870b87b3e1..f4f8482cee0 100644
--- a/libraries/tools/atomicfu/build.gradle.kts
+++ b/libraries/tools/atomicfu/build.gradle.kts
@@ -1,12 +1,5 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/tools/binary-compatibility-validator/build.gradle b/libraries/tools/binary-compatibility-validator/build.gradle
index 11ac8ddcb61..ad654476266 100644
--- a/libraries/tools/binary-compatibility-validator/build.gradle
+++ b/libraries/tools/binary-compatibility-validator/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'kotlin'
-apply plugin: 'jps-compatible'
 
 configurations {
     testArtifacts
@@ -17,10 +16,6 @@ dependencies {
     testArtifacts project(':kotlin-reflect')
 }
 
-pill {
-    variant = 'FULL'
-}
-
 sourceSets {
     test {
         java {
diff --git a/libraries/tools/kotlin-allopen/build.gradle.kts b/libraries/tools/kotlin-allopen/build.gradle.kts
index 197df6c8256..570deb20621 100644
--- a/libraries/tools/kotlin-allopen/build.gradle.kts
+++ b/libraries/tools/kotlin-allopen/build.gradle.kts
@@ -1,12 +1,5 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-assignment/build.gradle.kts b/libraries/tools/kotlin-assignment/build.gradle.kts
index f1caacf82e4..0dc5923e42e 100644
--- a/libraries/tools/kotlin-assignment/build.gradle.kts
+++ b/libraries/tools/kotlin-assignment/build.gradle.kts
@@ -1,12 +1,5 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index a2c1085041f..9d104e9df87 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -1,17 +1,11 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
-import org.jetbrains.kotlin.pill.PillExtension
 import java.nio.file.Paths
 
 plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 testsJar()
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index 7c03ad52bcf..dcdfc0153f5 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -1,11 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.DontIncludeResourceTransformer
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.jetbrains.kotlin.pill.PillExtension
 
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
     id("org.jetbrains.kotlinx.binary-compatibility-validator")
 }
 
@@ -15,10 +13,6 @@ repositories {
     gradlePluginPortal()
 }
 
-pill {
-    variant = PillExtension.Variant.FULL
-}
-
 kotlin {
     compilerOptions {
         optIn.addAll(
diff --git a/libraries/tools/kotlin-noarg/build.gradle.kts b/libraries/tools/kotlin-noarg/build.gradle.kts
index 2f559f4d248..bc5c8aa1b18 100644
--- a/libraries/tools/kotlin-noarg/build.gradle.kts
+++ b/libraries/tools/kotlin-noarg/build.gradle.kts
@@ -1,12 +1,5 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
index cd5783090a7..a75096b0d1a 100644
--- a/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
+++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle.kts
@@ -1,12 +1,5 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/libraries/tools/kotlin-serialization/build.gradle.kts b/libraries/tools/kotlin-serialization/build.gradle.kts
index 25cefdad232..4f793f31994 100644
--- a/libraries/tools/kotlin-serialization/build.gradle.kts
+++ b/libraries/tools/kotlin-serialization/build.gradle.kts
@@ -1,12 +1,5 @@
-import org.jetbrains.kotlin.pill.PillExtension
-
 plugins {
     id("gradle-plugin-common-configuration")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {
diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts
index 48eadf7f6c0..1c446dbc6c4 100644
--- a/test-instrumenter/build.gradle.kts
+++ b/test-instrumenter/build.gradle.kts
@@ -1,14 +1,8 @@
 import org.gradle.jvm.tasks.Jar
-import org.jetbrains.kotlin.pill.PillExtension
 
 plugins {
     java
     kotlin("jvm")
-    id("jps-compatible")
-}
-
-pill {
-    variant = PillExtension.Variant.FULL
 }
 
 dependencies {