diff --git a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
index 14fe667592d6bf06b75f40f9b5c62e31a921533d..0182e7b5d81f8deb81c2a14ba1bbb43674bdcbd8 100644
--- a/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
+++ b/gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
@@ -21,14 +21,6 @@ class KotlinAndroidConvention : Plugin<Project> {
         apply("com.google.devtools.ksp")
       }
 
-      val service = project.extensions.getByType<JavaToolchainService>()
-      val customLauncher = service.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(17))
-      }
-      tasks.withType<UsesKotlinJavaToolchain>().configureEach {
-        kotlinJavaToolchain.toolchain.use(customLauncher)
-      }
-
       // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
       tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {
diff --git a/gradle/convention/src/main/kotlin/KotlinConvention.kt b/gradle/convention/src/main/kotlin/KotlinConvention.kt
index 33b80176beb0ab6959c10f56021367ecae7178c1..79b5fb12d7d597656a1778425fc2e2053ed55342 100644
--- a/gradle/convention/src/main/kotlin/KotlinConvention.kt
+++ b/gradle/convention/src/main/kotlin/KotlinConvention.kt
@@ -26,14 +26,6 @@ class KotlinConvention : Plugin<Project> {
         apply("com.google.devtools.ksp")
       }
 
-      val service = project.extensions.getByType<JavaToolchainService>()
-      val customLauncher = service.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(17))
-      }
-      tasks.withType<UsesKotlinJavaToolchain>().configureEach {
-        kotlinJavaToolchain.toolchain.use(customLauncher)
-      }
-
       // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
       tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {