diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index 74d18abe7b6..e2b55135d70 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -79,8 +79,3 @@ projectTest {
         systemProperty("robolectric.classpath", robolectricClasspathProvider.get())
     }
 }
-
-//TODO: could be removed after bootstrap
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
-}
\ No newline at end of file
diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
index 46c31593312..a468d15d192 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
@@ -56,9 +56,4 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
     useJUnitPlatform()
 }
 
-val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt")
-
-//TODO: could be removed after bootstrap
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
-}
\ No newline at end of file
+val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt")
\ No newline at end of file
diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts
index c00ff20d445..b2178998927 100644
--- a/plugins/parcelize/parcelize-compiler/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts
@@ -118,8 +118,3 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
         println(filter.includePatterns)
     }
 }
-
-//TODO: could be removed after bootstrap
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
-}
\ No newline at end of file
diff --git a/plugins/scripting/scripting-compiler-impl/build.gradle.kts b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
index 68bd7bb88e6..589dbb2271b 100644
--- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
@@ -55,8 +55,3 @@ javadocJar()
 projectTest {
     workingDir = rootDir
 }
-
-//TODO: could be removed after bootstrap
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
-}
\ No newline at end of file