diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index eeaa816..6c0e836 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -450,7 +450,7 @@
 
   @Option(
       name = "incompatible_no_support_tools_in_action_inputs",
-      defaultValue = "false",
+      defaultValue = "true",
       documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
       effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
       metadataTags = {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 2acf955..fcdd48b 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -248,7 +248,7 @@
           .incompatibleNoAttrLicense(true)
           .incompatibleNoKwargsInBuildFiles(true)
           .incompatibleNoOutputAttrDefault(true)
-          .incompatibleNoSupportToolsInActionInputs(false)
+          .incompatibleNoSupportToolsInActionInputs(true)
           .incompatibleNoTargetOutputGroup(false)
           .incompatibleNoTransitiveLoads(true)
           .incompatibleObjcFrameworkCleanup(true)
diff --git a/src/test/py/bazel/native_test.bzl b/src/test/py/bazel/native_test.bzl
index 4cdafa3..dd86861 100644
--- a/src/test/py/bazel/native_test.bzl
+++ b/src/test/py/bazel/native_test.bzl
@@ -39,7 +39,7 @@
 def _exe_test_impl(ctx):
     out = ctx.actions.declare_file(ctx.label.name + "." + ctx.file.src.extension)
     ctx.actions.run(
-        inputs = [ctx.file.src],
+        tools = [ctx.file.src],
         outputs = [out],
         executable = "cmd.exe",
         arguments = ["/C", "copy /Y %IN% %OUT%"],
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index 496bc53..8c266ae 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -696,7 +696,7 @@
 def impl(ctx):
     ctx.actions.run_shell(
         command = "cat %s > %s" % (ctx.file._dep.path, ctx.outputs.sh.path),
-        inputs = [ctx.file._dep],
+        tools = [ctx.file._dep],
         outputs = [ctx.outputs.sh]
     )
 
diff --git a/src/test/shell/integration/py_args_escaping_test.sh b/src/test/shell/integration/py_args_escaping_test.sh
index 1100275..79b0cf8 100755
--- a/src/test/shell/integration/py_args_escaping_test.sh
+++ b/src/test/shell/integration/py_args_escaping_test.sh
@@ -345,7 +345,7 @@
     tool_inputs, tool_input_mfs = ctx.resolve_tools(tools = [ctx.attr.tool])
     ctx.actions.run(
         outputs = [ctx.outputs.out],
-        inputs = tool_inputs,
+        tools = tool_inputs,
         executable = ctx.executable.tool,
         arguments = [ctx.outputs.out.path, "a", "", "\"b \\\"c", "z"],
         use_default_shell_env = True,