diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index bd9c594bf55..a91673a044f 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -104,7 +104,7 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
         libraryNames.filter { it.contains(File.separator) },
         target,
         distribution,
-        compatibleCompilerVersions + KonanVersion.CURRENT,
+        compatibleCompilerVersions,
         resolverLogger
     ).libraryResolver()
 
diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
index 068d12568e9..25180386fb7 100644
--- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
+++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt
@@ -36,7 +36,7 @@ fun defaultResolver(
         repositories: List<String>,
         target: KonanTarget,
         distribution: Distribution = Distribution(),
-        compatibleCompilerVersions: List<KonanVersion>
+        compatibleCompilerVersions: List<KonanVersion> = emptyList()
 ): SearchPathResolverWithTarget = defaultResolver(repositories, emptyList(), target, distribution, compatibleCompilerVersions)
 
 fun defaultResolver(
@@ -44,7 +44,7 @@ fun defaultResolver(
         directLibs: List<String>,
         target: KonanTarget,
         distribution: Distribution,
-        compatibleCompilerVersions: List<KonanVersion>,
+        compatibleCompilerVersions: List<KonanVersion> = emptyList(),
         logger: Logger = DummyLogger,
         skipCurrentDir: Boolean = false
 ): SearchPathResolverWithTarget = KonanLibraryProperResolver(
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt
index cc077e636f5..ca1ce04e373 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/KonanLibrariesSpec.kt
@@ -145,12 +145,11 @@ open class KonanLibrariesSpec(val task: KonanArtifactWithLibrariesTask, val proj
     }
 
     fun asFiles(): List<File> = asFiles(
-            defaultResolver(
-                    repos.map { it.absolutePath },
-                    task.konanTarget,
-                    Distribution(konanHomeOverride = project.konanHome),
-                    listOf(KonanVersion.CURRENT)
-            )
+        defaultResolver(
+            repos.map { it.absolutePath },
+            task.konanTarget,
+            Distribution(konanHomeOverride = project.konanHome)
+        )
     )
 
     fun asFiles(resolver: SearchPathResolver): List<File> = mutableListOf<File>().apply {
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
index 79b32f6daa2..e894d6aff63 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt
@@ -235,10 +235,9 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
     override fun toModelArtifact(): KonanModelArtifact {
         val repos = libraries.repos
         val resolver = defaultResolver(
-                repos.map { it.absolutePath },
-                konanTarget,
-                Distribution(konanHomeOverride = project.konanHome),
-                listOf(KonanVersion.CURRENT)
+            repos.map { it.absolutePath },
+            konanTarget,
+            Distribution(konanHomeOverride = project.konanHome)
         )
 
         return KonanModelArtifactImpl(
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt
index 39281476f91..3fa163f4c7b 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanInteropTask.kt
@@ -171,10 +171,9 @@ open class KonanInteropTask @Inject constructor(val workerExecutor: WorkerExecut
     override fun toModelArtifact(): KonanModelArtifact {
         val repos = libraries.repos
         val resolver = defaultResolver(
-                repos.map { it.absolutePath },
-                konanTarget,
-                Distribution(konanHomeOverride = project.konanHome),
-                listOf(KonanVersion.CURRENT)
+            repos.map { it.absolutePath },
+            konanTarget,
+            Distribution(konanHomeOverride = project.konanHome)
         )
 
         return KonanModelArtifactImpl(
diff --git a/utilities/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt b/utilities/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt
index 3a9998d2fcd..ab386ebf2b3 100644
--- a/utilities/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt
+++ b/utilities/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt
@@ -50,8 +50,7 @@ fun invokeInterop(flavor: String, args: Array<String>): Array<String>? {
                 repos,
                 libraries.filter { it.contains(File.separator) },
                 target,
-                Distribution(),
-                listOf(KonanVersion.CURRENT)
+                Distribution()
         ).libraryResolver()
         val allLibraries = resolver.resolveWithDependencies(
                 libraries.toUnresolvedLibraries, noStdLib = true, noDefaultLibs = noDefaultLibs