diff --git a/buildSrc/src/main/kotlin/common-configuration.gradle.kts b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
index 678555f7b17..b28d426d610 100644
--- a/buildSrc/src/main/kotlin/common-configuration.gradle.kts
+++ b/buildSrc/src/main/kotlin/common-configuration.gradle.kts
@@ -28,8 +28,6 @@ dependencies {
     }
 }
 
-project.applyFixForStdlib16()
-
 apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
 project.configureJvmDefaultToolchain()
 project.addEmbeddedConfigurations()
@@ -201,17 +199,6 @@ fun Project.configureKotlinCompilationOptions() {
     }
 }
 
-// Should the workaround be removed ?
-// Still compile stdlib, reflect, kotlin.test and scripting runtimes
-// with JVM target 1.6 to simplify migration from Kotlin 1.6 to 1.7.
-fun Project.applyFixForStdlib16() {
-    plugins.withType<KotlinBasePluginWrapper>() {
-        dependencies {
-            "kotlinCompilerClasspath"(project(":libraries:tools:stdlib-compiler-classpath"))
-        }
-    }
-}
-
 fun Project.configureArtifacts() {
     tasks.withType<Javadoc>().configureEach {
         enabled = false
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
index 68ca59ad08f..f308dd0c66b 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt
@@ -56,7 +56,7 @@ fun CompilerConfiguration.setupJvmSpecificArguments(arguments: K2JVMCompilerArgu
         val jvmTarget = JvmTarget.fromString(jvmTargetValue)
         if (jvmTarget != null) {
             put(JVMConfigurationKeys.JVM_TARGET, jvmTarget)
-            if (jvmTarget == JvmTarget.JVM_1_6 && !isJvmTarget6Allowed()) {
+            if (jvmTarget == JvmTarget.JVM_1_6) {
                 messageCollector.report(
                     ERROR,
                     "JVM target 1.6 is no longer supported. Please migrate to JVM target 1.8 or above"
@@ -378,6 +378,3 @@ private val CompilerConfiguration.messageCollector: MessageCollector
 
 private fun getJavaVersion(): Int =
     System.getProperty("java.specification.version")?.substringAfter('.')?.toIntOrNull() ?: 6
-
-private fun isJvmTarget6Allowed(): Boolean =
-    K2JVMCompiler::class.java.classLoader.getResource("META-INF/unsafe-allow-jvm6") != null
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index 95250356ab4..1818eaec4cd 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -64,7 +64,6 @@ fun updateCompilerXml() {
         "libraries/tools/maven-archetypes",
         "libraries/tools/mutability-annotations-compat",
         "libraries/tools/script-runtime",
-        "libraries/tools/stdlib-compiler-classpath",
         "native/commonizer-api",
         "libraries/examples",
         "libraries/tools/kotlin-gradle-plugin-idea-proto",
diff --git a/libraries/kotlin.test/annotations-common/build.gradle b/libraries/kotlin.test/annotations-common/build.gradle
index f51ab470c70..dee9a7a904b 100644
--- a/libraries/kotlin.test/annotations-common/build.gradle
+++ b/libraries/kotlin.test/annotations-common/build.gradle
@@ -7,7 +7,6 @@ JvmToolchain.updateJvmTarget(project, "1.8")
 dependencies {
     api kotlinStdlib("common")
     testApi project(":kotlin-test:kotlin-test-common")
-    kotlinCompilerClasspath project(':libraries:tools:stdlib-compiler-classpath')
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinCompile) {
diff --git a/libraries/tools/stdlib-compiler-classpath/build.gradle.kts b/libraries/tools/stdlib-compiler-classpath/build.gradle.kts
deleted file mode 100644
index fcb81bccaa6..00000000000
--- a/libraries/tools/stdlib-compiler-classpath/build.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins {
-    java
-    id("jps-compatible")
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {}
-}
diff --git a/libraries/tools/stdlib-compiler-classpath/resources/META-INF/unsafe-allow-jvm6 b/libraries/tools/stdlib-compiler-classpath/resources/META-INF/unsafe-allow-jvm6
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/settings.gradle b/settings.gradle
index 6ff6f8c89a6..b9b15e4da3e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -313,8 +313,7 @@ include ":kotlin-imports-dumper-compiler-plugin",
         ":kotlinx-serialization-compiler-plugin",
         ":kotlin-serialization",
         ":kotlin-serialization-unshaded",
-        ":wasm:wasm.ir",
-        ":libraries:tools:stdlib-compiler-classpath"
+        ":wasm:wasm.ir"
 
 
 include ":kotlinx-atomicfu-compiler-plugin",