Remove Goma support from building Dart for testing on the bots.

This change is safe to land once RBE is supported on beta & stable:

https://dart-review.googlesource.com/c/sdk/+/357342
https://dart-review.googlesource.com/c/sdk/+/357324

Bug: b/296994239
Change-Id: I402772476f2a82310ab1b0eb0f458a76cfd6ed9f
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/357680
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
diff --git a/recipe_modules/build/api.py b/recipe_modules/build/api.py
index 3e850a1..7e168a0 100644
--- a/recipe_modules/build/api.py
+++ b/recipe_modules/build/api.py
@@ -2,142 +2,44 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
-import re
-
-from contextlib import contextmanager
 from recipe_engine import recipe_api
 
 class BuildApi(recipe_api.RecipeApi):
-  """Recipe module for building the Dart SDK with and without goma."""
+  """Recipe module for building the Dart SDK with and without RBE."""
 
   def __init__(self, properties, *args, **kwargs):
     super(BuildApi, self).__init__(*args, **kwargs)
     self._timeout = properties.timeout or 50 * 60  # 50 minutes
-
-    self._goma_enabled = not properties.disable_goma
-    # No need to download goma if it's disabled.
-    self._goma_ensured = properties.disable_goma
+    self._rbe_enabled = not properties.disable_goma
 
   def build(self, name='build dart', args=None):
     """Builds dart using the specified args"""
     if not args:  # pragma: no cover
       args = []
+    if not self._use_rbe and '--no-goma' not in args:
+      args = args + ['--no-goma']
     with self.m.depot_tools.on_path(), self.m.context(
-        cwd=self.m.path['checkout']):
-      if self._goma_enabled:
-        self._build_with_goma(name, args)
-      else:
-        if '--no-goma' not in args:
-          args = args + ['--no-goma']
-        self._run_build_py(name, args)
-
-  def gn(self, name='gn', args=None):
-    """Runs gn.py using the specified args"""
-    with self.m.context(env=self._build_env):
-      if not self._goma_enabled and '--no-goma' not in args:
-        args = args + ['--no-goma']
-      gn_py = self.m.path['checkout'].join('tools', 'gn.py')
-      self.m.step(name, ['python3', '-u', gn_py] + args)
-
-  @contextmanager
-  def goma(self):
-    self._ensure_goma()
-    with self.m.context(env=self._build_env):
-      try:
-        self._goma('restart')
-        try:
-          yield
-        finally:
-          self._goma('stat')
-      finally:
-        self._goma('stop')
-
-  @property
-  def _rbe(self):
-    return self.m.path.exists(
-        self.m.path['checkout'].join('buildtools').join('reclient'))
-
-  @property
-  def _rbe_cfg(self):
-    bot_os = self.m.platform.name
-    bot_arch = self.m.platform.arch
-    rbe_cfg = self.m.path['checkout'].join('build').join('rbe').join(
-        f'{bot_os}-{bot_arch}.cfg')
-    return rbe_cfg if self.m.path.exists(rbe_cfg) else None
-
-  @property
-  def _build_env(self):
-    if not self._goma_enabled:
-      return {}
-    if self._rbe:
-      env = {
-          'RBE': '1',
-          'RBE_proxy_log_dir': self.m.path['cleanup'],
-      }
-      # TODO: Until Dart 3.4.0 is released, stay backwards compatible so testing
-      # uses RBE on the stable channel.
-      rbe_cfg = self._rbe_cfg
-      if rbe_cfg:
-        env['RBE_cfg'] = rbe_cfg
-      return env
-    self._ensure_goma()
-    return {
-        'GOMA_DIR': self._goma_dir,
-    }
-
-  @property
-  def _goma_env(self):
-    env = {
-        'GOMA_DIR':
-            self._goma_dir,
-        'GOMA_CACHE_DIR':
-            self._goma_cache,
-        'GOMACTL_CRASH_REPORT_ID_FILE':
-            self.m.path['cleanup'].join('crash_report_id'),
-        'GOMA_DUMP_STATS_FILE':
-            self.m.path['cleanup'].join('goma_stats'),
-        'GOMA_HERMETIC':
-            'error',
-        'GOMA_SERVER_HOST':
-            'goma.chromium.org',
-    }
-    if self.m.platform.is_linux:
-      env['GOMA_ARBITRARY_TOOLCHAIN_SUPPORT'] = 'true'
-    return env
-
-  def _run_build_py(self, name, args):
-    with self.m.context(infra_steps=False):
+        cwd=self.m.path['checkout'], infra_steps=False, env=self._build_env):
       build_py = self.m.path['checkout'].join('tools', 'build.py')
       self.m.step(
           name, ['python3', '-u', build_py] + args, timeout=self._timeout)
 
-  def _build_with_goma(self, name, args):
-    build_env = self._build_env
-    if 'RBE' in build_env:
-      with self.m.context(env=build_env):
-        return self._run_build_py(name, args)
-    with self.goma():
-      args = args + ['--no-start-goma', '-j200']
-      self._run_build_py(name, args)
+  def gn(self, name='gn', args=None):
+    """Runs gn.py using the specified args"""
+    with self.m.context(env=self._build_env):
+      if not self._use_rbe and '--no-goma' not in args:
+        args = args + ['--no-goma']
+      gn_py = self.m.path['checkout'].join('tools', 'gn.py')
+      self.m.step(name, ['python3', '-u', gn_py] + args)
 
-  def _ensure_goma(self):
-    if not self._goma_ensured:
-      self._goma_root = self.m.path['cache'].join('goma')
-      self._goma_dir = self._goma_root.join('client')
-      self._goma_ctl = self._goma_dir.join('goma_ctl.py')
-      safe_buildername = re.sub(r'[^a-zA-Z0-9]', '_',
-                                self.m.buildbucket.builder_name)
-      self._goma_cache = self._goma_root.join('data', safe_buildername)
-      self.m.file.ensure_directory('goma cache directory', self._goma_cache)
-      goma_package = r'infra_internal/goma/client/${platform}'
-      ensure_file = self.m.cipd.EnsureFile().add_package(
-          goma_package, 'release')
-      self.m.cipd.ensure(self._goma_dir, ensure_file)
-      self._goma_ensured = True
+  @property
+  def _use_rbe(self):
+    return self._rbe_enabled and self.m.path.exists(
+        self.m.path['checkout'].join('buildtools').join('reclient'))
 
-  def _goma(self, cmd):
-    with self.m.context(env=self._goma_env):
-      self.m.step(
-          name='goma %s' % cmd,
-          cmd=['python3', self._goma_ctl, cmd],
-          infra_step=True)
+  @property
+  def _build_env(self):
+    return {} if not self._use_rbe else {
+        'RBE': '1',
+        'RBE_proxy_log_dir': self.m.path['cleanup'],
+    }
diff --git a/recipe_modules/build/tests/test_build.expected/custom-timeout.json b/recipe_modules/build/tests/test_build.expected/custom-timeout.json
index d61d45f..1e55d32 100644
--- a/recipe_modules/build/tests/test_build.expected/custom-timeout.json
+++ b/recipe_modules/build/tests/test_build.expected/custom-timeout.json
@@ -5,13 +5,9 @@
       "-u",
       "None/tools/build.py",
       "--super-fast",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "None",
-    "env": {
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
         "0"
diff --git a/recipe_modules/build/tests/test_build.expected/fail.json b/recipe_modules/build/tests/test_build.expected/fail.json
index ed071c3..f133ebc 100644
--- a/recipe_modules/build/tests/test_build.expected/fail.json
+++ b/recipe_modules/build/tests/test_build.expected/fail.json
@@ -1,105 +1,13 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data"
-    ],
-    "cwd": "None",
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "None",
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "None/tools/build.py",
       "--super-fast",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "None",
-    "env": {
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
         "0"
@@ -115,60 +23,6 @@
     ]
   },
   {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma stop"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "Step('build it') (retcode: 1)"
diff --git a/recipe_modules/build/tests/test_build.expected/rbe.json b/recipe_modules/build/tests/test_build.expected/rbe.json
index f062f38..152fff5 100644
--- a/recipe_modules/build/tests/test_build.expected/rbe.json
+++ b/recipe_modules/build/tests/test_build.expected/rbe.json
@@ -9,7 +9,6 @@
     "cwd": "None",
     "env": {
       "RBE": "1",
-      "RBE_cfg": "None/build/rbe/linux-intel.cfg",
       "RBE_proxy_log_dir": "[CLEANUP]"
     },
     "env_suffixes": {
diff --git a/recipe_modules/build/tests/test_build.expected/success.json b/recipe_modules/build/tests/test_build.expected/success.json
index c4df6eb..fe9eaeb 100644
--- a/recipe_modules/build/tests/test_build.expected/success.json
+++ b/recipe_modules/build/tests/test_build.expected/success.json
@@ -1,105 +1,13 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data"
-    ],
-    "cwd": "None",
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "None",
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "None/tools/build.py",
       "--super-fast",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "None",
-    "env": {
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
         "0"
@@ -112,60 +20,6 @@
     "timeout": 3000
   },
   {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma stop"
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipe_modules/build/tests/test_build.expected/timeout.json b/recipe_modules/build/tests/test_build.expected/timeout.json
index ea3e6d5..bf8f19c 100644
--- a/recipe_modules/build/tests/test_build.expected/timeout.json
+++ b/recipe_modules/build/tests/test_build.expected/timeout.json
@@ -1,105 +1,13 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data"
-    ],
-    "cwd": "None",
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "None",
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "None/tools/build.py",
       "--super-fast",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "None",
-    "env": {
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
         "0"
@@ -115,60 +23,6 @@
     ]
   },
   {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "None",
-    "env": {
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "name": "goma stop"
-  },
-  {
     "failure": {
       "failure": {},
       "humanReason": "Step('build it') (timeout) (retcode: None)"
diff --git a/recipe_modules/build/tests/test_build.py b/recipe_modules/build/tests/test_build.py
index f4fbc28..909a130 100644
--- a/recipe_modules/build/tests/test_build.py
+++ b/recipe_modules/build/tests/test_build.py
@@ -30,10 +30,7 @@
 
   yield api.test(
       'rbe',
-      api.path.exists(
-          api.path['checkout'].join('buildtools').join('reclient'),
-          api.path['checkout'].join('build').join('rbe').join(
-              'linux-intel.cfg')),
+      api.path.exists(api.path['checkout'].join('buildtools').join('reclient')),
   )
 
   yield api.test(
diff --git a/recipe_modules/build/tests/test_gn.expected/fail.json b/recipe_modules/build/tests/test_gn.expected/fail.json
index 15655dc..0b2d100 100644
--- a/recipe_modules/build/tests/test_gn.expected/fail.json
+++ b/recipe_modules/build/tests/test_gn.expected/fail.json
@@ -1,57 +1,12 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data"
-    ],
-    "infra_step": true,
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "None/tools/gn.py",
-      "--super-fast"
+      "--super-fast",
+      "--no-goma"
     ],
-    "env": {
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
     "name": "gn it",
     "~followup_annotations": [
       "@@@STEP_FAILURE@@@"
diff --git a/recipe_modules/build/tests/test_gn.expected/success.json b/recipe_modules/build/tests/test_gn.expected/success.json
index 2002e39..20bfbf2 100644
--- a/recipe_modules/build/tests/test_gn.expected/success.json
+++ b/recipe_modules/build/tests/test_gn.expected/success.json
@@ -1,57 +1,12 @@
 [
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data"
-    ],
-    "infra_step": true,
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "None/tools/gn.py",
-      "--super-fast"
+      "--super-fast",
+      "--no-goma"
     ],
-    "env": {
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
     "name": "gn it"
   },
   {
diff --git a/recipe_modules/dart/examples/example.expected/analyzer-linux-release-main.json b/recipe_modules/dart/examples/example.expected/analyzer-linux-release-main.json
index 47853fd..b691eb2 100644
--- a/recipe_modules/dart/examples/example.expected/analyzer-linux-release-main.json
+++ b/recipe_modules/dart/examples/example.expected/analyzer-linux-release-main.json
@@ -816,161 +816,18 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/analyzer_linux_release_main"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "DART_EXPERIMENTAL_BUILD": "1"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "DART_EXPERIMENTAL_BUILD": "1"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "DART_EXPERIMENTAL_BUILD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/analyzer_linux_release_main",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
       "--sanitizer=none",
       "-ax64",
       "-mrelease",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
       "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "DART_EXPERIMENTAL_BUILD": "1",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "DART_EXPERIMENTAL_BUILD": "1"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -999,92 +856,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "DART_EXPERIMENTAL_BUILD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/analyzer_linux_release_main",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "DART_EXPERIMENTAL_BUILD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/analyzer_linux_release_main",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "cipd",
       "ensure",
       "-root",
@@ -1109,7 +880,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure_installed (2)",
+    "name": "ensure_installed",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
diff --git a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
index 44b1ca9..e863b82 100644
--- a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
+++ b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
@@ -815,157 +815,17 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/analyzer_linux_release"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/analyzer_linux_release",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
       "--sanitizer=none",
       "-ax64",
       "-mrelease",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -994,90 +854,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/analyzer_linux_release",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "analyzer-linux-release-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/analyzer_linux_release",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "cipd",
       "ensure",
       "-root",
@@ -1102,7 +878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure_installed (2)",
+    "name": "ensure_installed",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
diff --git a/recipe_modules/dart/examples/example.expected/example-mac.json b/recipe_modules/dart/examples/example.expected/example-mac.json
index e674e09..c34adda 100644
--- a/recipe_modules/dart/examples/example.expected/example-mac.json
+++ b/recipe_modules/dart/examples/example.expected/example-mac.json
@@ -690,156 +690,17 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/vm_kernel_mac_release_x64"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/vm_kernel_mac_release_x64",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
       "--sanitizer=none",
       "-ax64",
       "-mrelease",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
-      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -868,88 +729,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/vm_kernel_mac_release_x64",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-kernel-mac-release-x64-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/vm_kernel_mac_release_x64",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/sdk/xcodebuild/custom_thing",
       "foo",
       "--bar",
diff --git a/recipe_modules/dart/examples/example.expected/pkg-linux-debug.json b/recipe_modules/dart/examples/example.expected/pkg-linux-debug.json
index 5fe80fc..18dd701 100644
--- a/recipe_modules/dart/examples/example.expected/pkg-linux-debug.json
+++ b/recipe_modules/dart/examples/example.expected/pkg-linux-debug.json
@@ -690,144 +690,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/pkg_linux_debug"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/pkg_linux_debug",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
@@ -836,13 +698,11 @@
       "-mdebug",
       "create_sdk",
       "ddc_stable_test",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -871,90 +731,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/pkg_linux_debug",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-linux-debug-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/pkg_linux_debug",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/sdk/out/DebugX64/dart-sdk/bin/dart",
       "analyze",
       "--suppress-analytics",
diff --git a/recipe_modules/dart/examples/example.expected/pkg-mac-release-arm64.json b/recipe_modules/dart/examples/example.expected/pkg-mac-release-arm64.json
index ef57734..59a5ee7 100644
--- a/recipe_modules/dart/examples/example.expected/pkg-mac-release-arm64.json
+++ b/recipe_modules/dart/examples/example.expected/pkg-mac-release-arm64.json
@@ -690,143 +690,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/pkg_mac_release_arm64"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/pkg_mac_release_arm64",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
@@ -835,13 +698,11 @@
       "-mrelease",
       "create_sdk",
       "ddc_stable_test",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -870,88 +731,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/pkg_mac_release_arm64",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-mac-release-arm64-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/pkg_mac_release_arm64",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "[CACHE]/builder/sdk/xcodebuild/ReleaseARM64/dart-sdk/bin/dart",
       "analyze",
       "--suppress-analytics",
diff --git a/recipe_modules/dart/examples/example.expected/pkg-win-release.json b/recipe_modules/dart/examples/example.expected/pkg-win-release.json
index d4e943f..6edd874 100644
--- a/recipe_modules/dart/examples/example.expected/pkg-win-release.json
+++ b/recipe_modules/dart/examples/example.expected/pkg-win-release.json
@@ -692,143 +692,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]\\goma\\data\\pkg_win_release"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-win-release-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\goma\\client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-win-release-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-win-release-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\pkg_win_release",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]\\builder\\sdk\\tools\\build.py",
@@ -837,13 +700,11 @@
       "-mrelease",
       "create_sdk",
       "ddc_stable_test",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-win-release-main",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
+      "BUILDBOT_BUILDERNAME": "pkg-win-release-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -872,88 +733,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-win-release-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\pkg_win_release",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "pkg-win-release-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\pkg_win_release",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "[CACHE]\\builder\\sdk\\out\\ReleaseX64\\dart-sdk\\bin\\dart.exe",
       "analyze",
       "--suppress-analytics",
diff --git a/recipe_modules/dart/examples/example.expected/vm-win-arm64.json b/recipe_modules/dart/examples/example.expected/vm-win-arm64.json
index b211011..4dd9e41 100644
--- a/recipe_modules/dart/examples/example.expected/vm-win-arm64.json
+++ b/recipe_modules/dart/examples/example.expected/vm-win-arm64.json
@@ -842,146 +842,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]\\goma\\data\\vm_win_release_arm64"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-arm64-main",
-      "DART_USE_CRASHPAD": "1"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\goma\\client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-arm64-main",
-      "DART_USE_CRASHPAD": "1"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-arm64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\vm_win_release_arm64",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]\\builder\\sdk\\tools\\build.py",
@@ -989,14 +849,12 @@
       "-aarm64",
       "-mrelease",
       "runtime",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "env": {
       "BUILDBOT_BUILDERNAME": "vm-win-release-arm64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
+      "DART_USE_CRASHPAD": "1"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1025,90 +883,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-arm64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\vm_win_release_arm64",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-arm64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\vm_win_release_arm64",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "cipd.bat",
       "ensure",
       "-root",
@@ -1133,7 +907,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure_installed (2)",
+    "name": "ensure_installed",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
diff --git a/recipe_modules/dart/examples/example.expected/vm-win-x64.json b/recipe_modules/dart/examples/example.expected/vm-win-x64.json
index 589cd50..42dbfc2 100644
--- a/recipe_modules/dart/examples/example.expected/vm-win-x64.json
+++ b/recipe_modules/dart/examples/example.expected/vm-win-x64.json
@@ -842,146 +842,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]\\goma\\data\\vm_win_release_x64"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-x64-main",
-      "DART_USE_CRASHPAD": "1"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd.bat",
-      "ensure",
-      "-root",
-      "[CACHE]\\goma\\client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-x64-main",
-      "DART_USE_CRASHPAD": "1"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-x64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\vm_win_release_x64",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]\\builder\\sdk\\tools\\build.py",
@@ -989,14 +849,12 @@
       "-ax64",
       "-mrelease",
       "runtime",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]\\builder\\sdk",
     "env": {
       "BUILDBOT_BUILDERNAME": "vm-win-release-x64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMA_DIR": "[CACHE]\\goma\\client"
+      "DART_USE_CRASHPAD": "1"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -1025,90 +883,6 @@
   },
   {
     "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-x64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\vm_win_release_x64",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]\\goma\\client\\goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]\\builder\\sdk",
-    "env": {
-      "BUILDBOT_BUILDERNAME": "vm-win-release-x64-main",
-      "DART_USE_CRASHPAD": "1",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]\\crash_report_id",
-      "GOMA_CACHE_DIR": "[CACHE]\\goma\\data\\vm_win_release_x64",
-      "GOMA_DIR": "[CACHE]\\goma\\client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]\\goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
       "cipd.bat",
       "ensure",
       "-root",
@@ -1133,7 +907,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure_installed (2)",
+    "name": "ensure_installed",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
diff --git a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
index 6bef5f5..42760f0 100644
--- a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
+++ b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
@@ -610,147 +610,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/dart2js_win_debug_x64_firefox_try"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox_try",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
@@ -759,14 +618,12 @@
       "-mdebug",
       "foo",
       "--bar",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -796,92 +653,6 @@
   {
     "cmd": [
       "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox_try",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-try",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox_try",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
-      "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/test.py",
       "--progress=status",
diff --git a/recipes/dart/neo.expected/failing-test-step-starts-bisection.json b/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
index 993dd38..9026472 100644
--- a/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
+++ b/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
@@ -545,147 +545,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/dart2js_win_debug_x64_firefox"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
@@ -694,14 +553,12 @@
       "-mdebug",
       "foo",
       "--bar",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -731,92 +588,6 @@
   {
     "cmd": [
       "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
-      "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/test.py",
       "--progress=status",
diff --git a/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json b/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
index 4340173..9b85725 100644
--- a/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
@@ -545,147 +545,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/dart2js_win_debug_x64_firefox"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
@@ -694,14 +553,12 @@
       "-mdebug",
       "foo",
       "--bar",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -731,92 +588,6 @@
   {
     "cmd": [
       "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
-      "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/test.py",
       "--progress=status",
diff --git a/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json b/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
index 5aef140..0cb7bc3 100644
--- a/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
@@ -545,147 +545,6 @@
   },
   {
     "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0o777",
-      "[CACHE]/goma/data/dart2js_win_debug_x64_firefox"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma cache directory"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma restart"
-  },
-  {
-    "cmd": [
       "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/build.py",
@@ -694,14 +553,12 @@
       "-mdebug",
       "foo",
       "--bar",
-      "--no-start-goma",
-      "-j200"
+      "--no-goma"
     ],
     "cwd": "[CACHE]/builder/sdk",
     "env": {
       "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMA_DIR": "[CACHE]/goma/client"
+      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main"
     },
     "env_suffixes": {
       "DEPOT_TOOLS_UPDATE": [
@@ -731,92 +588,6 @@
   {
     "cmd": [
       "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stat"
-  },
-  {
-    "cmd": [
-      "python3",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "cwd": "[CACHE]/builder/sdk",
-    "env": {
-      "ANALYZER_STATE_LOCATION_OVERRIDE": "[CLEANUP]/analysis-cache",
-      "BUILDBOT_BUILDERNAME": "dart2js-win-debug-x64-firefox-main",
-      "GOMACTL_CRASH_REPORT_ID_FILE": "[CLEANUP]/crash_report_id",
-      "GOMA_ARBITRARY_TOOLCHAIN_SUPPORT": "true",
-      "GOMA_CACHE_DIR": "[CACHE]/goma/data/dart2js_win_debug_x64_firefox",
-      "GOMA_DIR": "[CACHE]/goma/client",
-      "GOMA_DUMP_STATS_FILE": "[CLEANUP]/goma_stats",
-      "GOMA_HERMETIC": "error",
-      "GOMA_SERVER_HOST": "goma.chromium.org"
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0",
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]",
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "dart:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "goma stop"
-  },
-  {
-    "cmd": [
-      "python3",
       "-u",
       "[CACHE]/builder/sdk/tools/test.py",
       "--progress=status",