diff --git a/buildSrc/src/main/kotlin/JvmToolchain.kt b/buildSrc/src/main/kotlin/JvmToolchain.kt
index b2fe362c4c4..ee0cddf9e3d 100644
--- a/buildSrc/src/main/kotlin/JvmToolchain.kt
+++ b/buildSrc/src/main/kotlin/JvmToolchain.kt
@@ -51,16 +51,16 @@ fun Project.configureJvmToolchain(
 
         if (shouldOverrideObsoleteJdk(jdkVersion)) {
             kotlinExtension.jvmToolchain {
-                @Suppress("USELESS_CAST") // Remove after boostrap update
-                (this as JavaToolchainSpec).languageVersion
-                    .set(JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!))
+                languageVersion.set(
+                    JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!)
+                )
             }
             updateJvmTarget(jdkVersion.targetName)
         } else {
             kotlinExtension.jvmToolchain {
-                @Suppress("USELESS_CAST") // Remove after boostrap update
-                (this as JavaToolchainSpec).languageVersion
-                    .set(JavaLanguageVersion.of(jdkVersion.majorVersion))
+                languageVersion.set(
+                    JavaLanguageVersion.of(jdkVersion.majorVersion)
+                )
             }
         }