diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt
index 47ed1593c36..6c4075e69a5 100644
--- a/buildSrc/src/main/kotlin/GradleCommon.kt
+++ b/buildSrc/src/main/kotlin/GradleCommon.kt
@@ -267,10 +267,13 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
         wireGradleVariantToCommonGradleVariant(this, commonSourceSet)
 
         // https://youtrack.jetbrains.com/issue/KT-51913
-        configurations["default"].attributes.attribute(
-            TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
-            objects.named(TargetJvmEnvironment::class, "no-op")
-        )
+        // Remove workaround after bootstrap update
+        if (configurations["default"].attributes.contains(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE)) {
+            configurations["default"].attributes.attribute(
+                TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+                objects.named(TargetJvmEnvironment::class, "no-op")
+            )
+        }
 
         plugins.withType<JavaLibraryPlugin>().configureEach {
             this@reconfigureMainSourcesSetForGradlePlugin
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 04690e3f531..a078ea67728 100755
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -522,10 +522,6 @@ internal abstract class AbstractKotlinPlugin(
             // Setup the consuming configurations:
             project.dependencies.attributesSchema.attribute(KotlinPlatformType.attribute)
 
-            project.configurations.getByName("default").apply {
-                setupAsLocalTargetSpecificConfigurationIfSupported(kotlinTarget)
-            }
-
             // Setup the published configurations:
             // Don't set the attributes for common module; otherwise their 'common' platform won't be compatible with the one in
             // platform-specific modules