diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle
index 912690f68b5..cf3187b0542 100644
--- a/libraries/stdlib/jvm/build.gradle
+++ b/libraries/stdlib/jvm/build.gradle
@@ -66,6 +66,7 @@ configurations {
     coroutinesExperimentalMigrationTestCompile.extendsFrom(coroutinesExperimentalTestCompile)
     longRunningTestCompile.extendsFrom(testCompile)
     builtins
+    compileOnly.extendsFrom(builtins)
 }
 
 dependencies {
@@ -161,8 +162,6 @@ task dexMethodCount(type: DexMethodCount) {
 check.dependsOn(dexMethodCount)
 
 compileKotlin {
-    dependsOn(configurations.builtins)
-    classpath += configurations.builtins
     kotlinOptions {
         freeCompilerArgs = [
                 "-version",