diff --git a/build.gradle.kts b/build.gradle.kts
index 2cb83906ed4..ec063534385 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -505,7 +505,6 @@ allprojects {
     }
 
     val jvmCompilerArgs = listOf(
-        "-Xjvm-default=compatibility",
         "-Xno-optimized-callable-references",
         "-Xno-kotlin-nothing-value-exception",
         "-Xsuppress-deprecated-jvm-target-warning" // Remove as soon as there are no modules for JDK 1.6 & 1.7
diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt
index b9b2f06a939..c5fab34ac7b 100644
--- a/buildSrc/src/main/kotlin/JvmToolchain.kt
+++ b/buildSrc/src/main/kotlin/JvmToolchain.kt
@@ -70,10 +70,6 @@ fun Project.configureJvmToolchain(
                     options.encoding = "UTF-8"
                 }
             }
-
-        tasks.withType<KotlinCompile>().configureEach {
-            kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
-        }
     }
 }
 
diff --git a/compiler/frontend/build.gradle.kts b/compiler/frontend/build.gradle.kts
index f05e981de13..e54be96ccec 100644
--- a/compiler/frontend/build.gradle.kts
+++ b/compiler/frontend/build.gradle.kts
@@ -24,3 +24,7 @@ sourceSets {
     "main" { projectDefault() }
     "test" {}
 }
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index c41c70deda5..4507c2aaa71 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -73,8 +73,6 @@ where advanced options include:
                                                               in the interface (annotating an existing method can break binary compatibility).
                              -Xjvm-default=compatibility      Deprecated. Allow usages of @JvmDefault; generate a compatibility accessor
                                                               in the DefaultImpls class in addition to the default interface method.
-  -Xjvm-default-allow-non-default-inheritance
-                             Allow inheritance from 'all*' modes for 'disable' one
   -Xklib=<path>              Paths to cross-platform libraries in .klib format
   -Xlambdas={class|indy}     Select code generation scheme for lambdas.
                              -Xlambdas=indy                      Generate lambdas using `invokedynamic` with `LambdaMetafactory.metafactory`. Requires `-jvm-target 1.8` or greater.
diff --git a/libraries/scripting/intellij/build.gradle.kts b/libraries/scripting/intellij/build.gradle.kts
index 478fdec2686..d43b390a1cd 100644
--- a/libraries/scripting/intellij/build.gradle.kts
+++ b/libraries/scripting/intellij/build.gradle.kts
@@ -23,3 +23,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
 publish()
 
 standardPublicJars()
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
+}
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
index e2b55135d70..74d18abe7b6 100644
--- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts
@@ -79,3 +79,8 @@ 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 a468d15d192..46c31593312 100644
--- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
+++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts
@@ -56,4 +56,9 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
     useJUnitPlatform()
 }
 
-val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt")
\ No newline at end of file
+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
diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts
index b2178998927..c00ff20d445 100644
--- a/plugins/parcelize/parcelize-compiler/build.gradle.kts
+++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts
@@ -118,3 +118,8 @@ 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 589dbb2271b..68bd7bb88e6 100644
--- a/plugins/scripting/scripting-compiler-impl/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler-impl/build.gradle.kts
@@ -55,3 +55,8 @@ 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