1 files changed, 1 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
index e4659e9ebf..2b81f74ff1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/GenericRules.java
@@ -46,16 +46,7 @@ public class GenericRules implements RuleSet {
 
     try {
       builder.addWorkspaceFilePrefix(
-          ResourceFileLoader.loadResource(BazelRuleClassProvider.class, "tools.WORKSPACE")
-              // Hackily select the java_toolchain based on the host JDK version. JDK 8 and
-              // 9 host_javabases require different toolchains, e.g. to use --patch-module
-              // instead of -Xbootclasspath/p:.
-              .replace(
-                  "%java_toolchain%",
-                  isJdk8OrEarlier()
-                      ? "@bazel_tools//tools/jdk:toolchain_hostjdk8"
-                      : "@bazel_tools//tools/jdk:toolchain_hostjdk10"));
-
+          ResourceFileLoader.loadResource(BazelRuleClassProvider.class, "tools.WORKSPACE"));
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }
@@ -65,8 +56,4 @@ public class GenericRules implements RuleSet {
   public ImmutableList<RuleSet> requires() {
     return ImmutableList.of(CoreRules.INSTANCE);
   }
-
-  private static boolean isJdk8OrEarlier() {
-    return Double.parseDouble(System.getProperty("java.class.version")) <= 52.0;
-  }
 }