diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 598a4b5..ca3b8bb 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -93,7 +93,7 @@
     if (not clobber) and (mount_git or
                           mount_builder) and (bucket != OFFICIAL_BUILD_BUCKET):
       self.m.cache.mount_cache('builder', force=True)
-    self._setup_win_toolchain(env)
+      self._setup_win_toolchain(env)
     # Grab any gclient custom variables passed as properties.
     local_custom_vars = self.m.shard_util_v2.unfreeze_dict(
         self.m.properties.get('gclient_variables', {})
diff --git a/recipe_modules/repo_util/examples/full.expected/win.json b/recipe_modules/repo_util/examples/full.expected/win.json
index aa9f3fa..9638236 100644
--- a/recipe_modules/repo_util/examples/full.expected/win.json
+++ b/recipe_modules/repo_util/examples/full.expected/win.json
@@ -804,40 +804,6 @@
     "name": "ensure directory"
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -948,8 +914,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1015,8 +980,7 @@
     "cwd": "[START_DIR]\\engine",
     "env": {
       "DEPOT_TOOLS_WIN_TOOLCHAIN": "1",
-      "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
-      "GYP_MSVS_VERSION": "2022"
+      "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1046,8 +1010,7 @@
     "cwd": "[START_DIR]\\engine",
     "env": {
       "DEPOT_TOOLS_WIN_TOOLCHAIN": "1",
-      "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
-      "GYP_MSVS_VERSION": "2022"
+      "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1077,8 +1040,7 @@
     "cwd": "[START_DIR]\\engine",
     "env": {
       "DEPOT_TOOLS_WIN_TOOLCHAIN": "1",
-      "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
-      "GYP_MSVS_VERSION": "2022"
+      "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
diff --git a/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_flutter_main.json b/recipes/engine/engine.expected/win_flutter_main.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_flutter_main.json
+++ b/recipes/engine/engine.expected/win_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_font_subset_flutter_main.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_font_subset_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_no_lto_flutter_main.json b/recipes/engine/engine.expected/win_no_lto_flutter_main.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_flutter_main.json b/recipes/engine/engine.expected/win_upload_flutter_main.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_upload_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json
index fcc5d31..3f2f541 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json b/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json
index ca35e62..04d6e7a 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json
@@ -266,64 +266,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "[CACHE]\\builder\\src\\build\\win_toolchain.json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "copy win_toolchain_metadata"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CACHE]\\builder\\vs_toolchain_root\\data.json",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "flutter:flutter"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "read win toolchain metadata",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@data.json@{@@@",
-      "@@@STEP_LOG_LINE@data.json@  \"version\": \"2022\"@@@",
-      "@@@STEP_LOG_LINE@data.json@}@@@",
-      "@@@STEP_LOG_END@data.json@@@"
-    ]
-  },
-  {
     "cmd": [],
     "name": "Checkout source code"
   },
@@ -364,8 +306,7 @@
       "GIT_TRACE2_EVENT": "[CLEANUP]\\trace2-event",
       "GIT_TRACE_CURL": "[CLEANUP]\\trace-curl",
       "GIT_TRACE_CURL_NO_DATA": "1",
-      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet",
-      "GYP_MSVS_VERSION": "2022"
+      "GIT_TRACE_PACKET": "[CLEANUP]\\trace-packet"
     },
     "env_prefixes": {
       "PATH": [
@@ -454,8 +395,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -507,8 +447,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [
@@ -560,8 +499,7 @@
       "DEPOT_TOOLS_WIN_TOOLCHAIN_ROOT": "[CACHE]\\builder\\vs_toolchain_root",
       "FLUTTER_LOGS_DIR": "[CLEANUP]\\flutter_logs_dir",
       "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir",
-      "GYP_MSVS_VERSION": "2022"
+      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]\\flutter_logs_dir"
     },
     "env_prefixes": {
       "PATH": [