diff --git a/build.gradle.kts b/build.gradle.kts
index e769e8e4895..833766685a5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,15 +34,6 @@ buildscript {
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
         classpath("net.sf.proguard:proguard-gradle:6.1.0")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
-
-        // a workaround to add another one buildSrc with Cidr-specific tools to Gradle classpath
-        val kotlinUltimateBuildSrcDep = "org.jetbrains.kotlin.ultimate:buildSrc:1.0"
-        if (findProperty("cidrPluginsEnabled")?.toString()?.toBoolean() == true) {
-            logger.info("Adding buildscript classpath dependency \"$kotlinUltimateBuildSrcDep\" in build.gradle.kts")
-            classpath(kotlinUltimateBuildSrcDep)
-        } else {
-            logger.info("NOT adding buildscript classpath dependency \"$kotlinUltimateBuildSrcDep\" in build.gradle.kts")
-        }
     }
 }
 
diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties
index ad3f0f62fb7..aaf86a19422 100644
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -4,3 +4,5 @@ cacheRedirectorEnabled=true
 
 #buildSrc.kotlin.repo=https://jcenter.bintray.com
 #buildSrc.kotlin.version=1.1.50
+
+#cidrPluginsEnabled=true
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index c0c19997aab..6467406154a 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -1,4 +1,3 @@
-
 pluginManagement {
     repositories {
         if (cacheRedirectorEnabled == 'true') {
@@ -12,3 +11,9 @@ pluginManagement {
 }
 
 include "prepare-deps"
+
+def includeCidrPlugins = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled) && file("../kotlin-ultimate").exists()
+if (includeCidrPlugins) {
+    include ":prepare-deps:kotlin-native-platform-deps"
+    project(":prepare-deps:kotlin-native-platform-deps").projectDir = file("../kotlin-ultimate/buildSrc/prepare-deps/kotlin-native-platform-deps")
+}
diff --git a/settings.gradle b/settings.gradle
index 31b89a6a775..22a7175bfbd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -222,19 +222,17 @@ include ":kotlin-build-common",
         ":kotlin-serialization-unshaded",
         ":kotlin-serialization:plugin-marker"
 
-
-def includeCidr = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled)
-if (includeCidr) {
-    logger.info("Including :kotlin-ultimate in settings.gradle")
-    includeBuild "kotlin-ultimate/buildSrc"
+def includeCidrPlugins = hasProperty("cidrPluginsEnabled") && Boolean.parseBoolean(cidrPluginsEnabled) && file("kotlin-ultimate").exists()
+if (includeCidrPlugins) {
+    logger.info("Including CIDR plugins in settings.gradle")
     include ":kotlin-ultimate:ide:cidr-native",
-            ":kotlin-ultimate:ide:appcode-native",
             ":kotlin-ultimate:ide:clion-native",
+            ":kotlin-ultimate:ide:appcode-native",
             ":kotlin-ultimate:prepare:cidr-plugin",
-            ":kotlin-ultimate:prepare:appcode-plugin",
-            ":kotlin-ultimate:prepare:clion-plugin"
+            ":kotlin-ultimate:prepare:clion-plugin",
+            ":kotlin-ultimate:prepare:appcode-plugin"
 } else {
-    logger.info("NOT including :kotlin-ultimate in settings.gradle")
+    logger.info("NOT including CIDR plugins in settings.gradle")
 }
 
 def isTeamcityBuild = hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null