diff --git a/src/main/starlark/builtins_bzl/common/java/android_lint.bzl b/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
index cd2b0fd..24b1c8b 100644
--- a/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/android_lint.bzl
@@ -127,6 +127,5 @@
         tools = tools,
         arguments = args_list,
         execution_requirements = {"supports-workers": "1"},
-        toolchain = semantics.JAVA_TOOLCHAIN_TYPE,
     )
     return android_lint_out
diff --git a/src/main/starlark/builtins_bzl/common/java/java_library.bzl b/src/main/starlark/builtins_bzl/common/java/java_library.bzl
index b38490f..7d64e2f 100644
--- a/src/main/starlark/builtins_bzl/common/java/java_library.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/java_library.bzl
@@ -170,10 +170,7 @@
 
 java_library = rule(
     _proxy,
-    attrs = merge_attrs(
-        JAVA_LIBRARY_ATTRS,
-        {"_use_auto_exec_groups": attr.bool(default = True)},
-    ),
+    attrs = JAVA_LIBRARY_ATTRS,
     provides = [JavaInfo],
     outputs = {
         "classjar": "lib%{name}.jar",
diff --git a/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl b/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl
index d054990..db8f954 100644
--- a/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl
+++ b/src/main/starlark/builtins_bzl/common/java/proguard_validation.bzl
@@ -41,7 +41,6 @@
         arguments = [args],
         inputs = [spec_file],
         outputs = [validated_proguard_spec],
-        toolchain = Label(semantics.JAVA_TOOLCHAIN_TYPE),
     )
 
     return validated_proguard_spec