diff --git a/gradle/java.gradle b/gradle/java.gradle
index 3c87da682fff..2776880198f8 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -59,7 +59,9 @@ tasks.withType(JavaCompile) {
 //  options.release = project.ext.release.majorVersion.toInteger()
 //}
 tasks.withType(ScalaCompile) {
-  options.release = project.ext.release.majorVersion.toInteger()
+//  options.release = project.ext.release.majorVersion.toInteger()
+  sourceCompatibility = JavaVersion.toVersion(project.ext.release)
+  targetCompatibility = JavaVersion.toVersion(project.ext.release)
 }
 
 apply plugin: "eclipse"
diff --git a/instrumentation/rmi/rmi.gradle b/instrumentation/rmi/rmi.gradle
index e55f16db2019..ca625dfebaa8 100644
--- a/instrumentation/rmi/rmi.gradle
+++ b/instrumentation/rmi/rmi.gradle
@@ -17,11 +17,11 @@ test.dependsOn "rmic"
 // We cannot use "--release" javac option here because that will forbid importing "sun.rmi" package.
 // We also can't seem to use the toolchain without the "--release" option. So disable everything.
 
-java {
-  toolchain {
-    languageVersion = null
-  }
-}
+//java {
+//  toolchain {
+//    languageVersion = null
+//  }
+//}
 
 tasks.withType(JavaCompile) {
   options.release = null