diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
index 0894852..07e38b7 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java
@@ -225,16 +225,6 @@
               + " 'test'.")
   public List<Map.Entry<RegexFilter, List<Label>>> targetFilterToAdditionalExecConstraints;
 
-  @Option(
-      name = "incompatible_override_toolchain_transition",
-      defaultValue = "true",
-      deprecationWarning = "This is now always set, please remove this flag.",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = OptionEffectTag.LOADING_AND_ANALYSIS,
-      metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-      help = "Deprecated, this is no longer in use and should be removed.")
-  public boolean overrideToolchainTransition;
-
   @Override
   public PlatformOptions getHost() {
     PlatformOptions host = (PlatformOptions) getDefault();
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 be572b8..d1b1dc8 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
@@ -294,6 +294,15 @@
         effectTags = {OptionEffectTag.UNKNOWN},
         help = "No-op")
     public boolean experimentalMultiThreadedDigest;
+
+    @Option(
+        name = "incompatible_override_toolchain_transition",
+        defaultValue = "true",
+        deprecationWarning = "This is now always set, please remove this flag.",
+        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
+        effectTags = OptionEffectTag.UNKNOWN,
+        help = "Deprecated, this is no longer in use and should be removed.")
+    public boolean overrideToolchainTransition;
   }
 
   /** This is where deprecated Bazel-specific options only used by the build command go to die. */