diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
index 4d3d41a540f..aaec8a5bc66 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
+++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle
@@ -1,8 +1,4 @@
 
-plugins {
-    id 'org.jetbrains.intellij'
-}
-
 apply plugin: 'kotlin'
 apply plugin: 'maven'
 
@@ -11,13 +7,6 @@ repositories {
     jcenter()
 }
 
-intellij {
-    version = rootProject.ext["versions.intellij"]
-    instrumentCode = false
-    configureDefaultDependencies = false
-    extraDependencies = ['intellij-core']
-}
-
 dependencies {
     compile project(':kotlin-gradle-plugin-api')
     // Use this dependency instead when building apart from the other modules:
@@ -34,8 +23,10 @@ dependencies {
     compileOnly gradleApi()
 }
 
-afterEvaluate {
-    dependencies {
-        compileOnly intellijExtra('intellij-core')
+    compileOnly("kotlin.build.custom.deps:intellij-core:${rootProject.ext["versions.intellijSdk"]}") {
+        artifact {
+            name = 'intellij-core'
+            extension = 'jar'
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle
index 0506f37b0be..876f061b36d 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle
@@ -13,10 +13,6 @@ buildscript {
     }
 }
 
-plugins {
-    id 'org.jetbrains.intellij'
-}
-
 configureJvmProject(project)
 configurePublishing(project)
 
@@ -26,13 +22,6 @@ repositories {
     maven { url 'https://maven.google.com' }
 }
 
-intellij {
-    version = rootProject.ext["versions.intellij"]
-    instrumentCode = false
-    configureDefaultDependencies = false
-    extraDependencies = ['intellij-core']
-}
-
 configurations {
     agp25CompileOnly
 }
@@ -54,6 +43,13 @@ dependencies {
     compileOnly 'org.codehaus.groovy:groovy-all:2.4.12'
     compileOnly gradleApi()
 
+    compileOnly("kotlin.build.custom.deps:intellij-core:${rootProject.ext["versions.intellijSdk"]}") {
+        artifact {
+            name = 'intellij-core'
+            extension = 'jar'
+        }
+    }
+
     runtime project(path: ':kotlin-compiler-embeddable', configuration: "runtimeJar")
     runtime project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")
     runtime project(path: ':kotlin-android-extensions', configuration: 'runtimeJar')
@@ -76,12 +72,6 @@ dependencies {
     testCompileOnly project(':kotlin-annotation-processing-gradle')
 }
 
-afterEvaluate {
-    dependencies {
-        compileOnly intellijExtra('intellij-core')
-    }
-}
-
 tasks.withType(project.compileKotlin.class) {
     kotlinOptions.jdkHome = JDK_18
 }