diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
index 730c55ffb0a9cf..88f1333b604365 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java
@@ -432,6 +432,18 @@ public static class BuildGraveyardOptions extends OptionsBase {
         metadataTags = {OptionMetadataTag.EXPERIMENTAL},
         help = "Deprecated. No-op.")
     public List<String> multiCpus;
+
+    @Option(
+        name = "action_cache_store_output_metadata",
+        oldName = "experimental_action_cache_store_output_metadata",
+        defaultValue = "false",
+        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+        effectTags = {
+          OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION,
+          OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS
+        },
+        help = "no-op")
+    public boolean actionCacheStoreOutputMetadata;
   }
 
   /** This is where deprecated Bazel-specific options only used by the build command go to die. */
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
index cb3f567935c274..423260ab72d32c 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
@@ -373,18 +373,6 @@ public boolean useTopLevelTargetsForSymlinks() {
       help = "Whether to use the action cache")
   public boolean useActionCache;
 
-  @Option(
-      name = "action_cache_store_output_metadata",
-      oldName = "experimental_action_cache_store_output_metadata",
-      defaultValue = "false",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {
-        OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION,
-        OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS
-      },
-      help = "no-op")
-  public boolean actionCacheStoreOutputMetadata;
-
   @Option(
       name = "rewind_lost_inputs",
       defaultValue = "false",