Partially roll back CL/261534671 -- only --subcommands should imply --materialize_param_files.

RELNOTES:
PiperOrigin-RevId: 262574442

src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
index 318ac9e..7e04b67 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java
@@ -136,14 +136,12 @@
       help =
           "Writes intermediate parameter files to output tree even when using "
               + "remote action execution. Useful when debugging actions. "
-              + "This is implied by --subcommands or --verbose_failures.")
+              + "This is implied by --subcommands.")
   public boolean materializeParamFiles;
 
   public boolean shouldMaterializeParamFiles() {
-    // Implied by --subcommands or --verbose_failures
-    return materializeParamFiles
-        || showSubcommands != ActionExecutionContext.ShowSubcommands.FALSE
-        || verboseFailures;
+    // Implied by --subcommands
+    return materializeParamFiles || showSubcommands != ActionExecutionContext.ShowSubcommands.FALSE;
   }
 
   @Option(

src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
index aa60c3b..73454ff 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -821,11 +821,6 @@
     testParamFilesAreMaterializedForFlag("--subcommands");
   }
 
-  @Test
-  public void testMaterializeParamFilesIsImpliedByVerboseFailures() throws Exception {
-    testParamFilesAreMaterializedForFlag("--verbose_failures");
-  }
-
   private void testParamFilesAreMaterializedForFlag(String flag) throws Exception {
     ExecutionOptions executionOptions = Options.parse(ExecutionOptions.class, flag).getOptions();
     executionOptions.materializeParamFiles = true;