diff --git a/recipe_modules/recipe_testing/api.py b/recipe_modules/recipe_testing/api.py
index 1d19c27..81ececa 100644
--- a/recipe_modules/recipe_testing/api.py
+++ b/recipe_modules/recipe_testing/api.py
@@ -42,11 +42,6 @@
         self._led_data = self._led_data.then("edit", *args)
 
 
-def led_task_name(builder):
-    """Returns the name to use for the led swarming task for the builder."""
-    return "recipes-cq:%s" % builder
-
-
 class RecipeTestingApi(recipe_api.RecipeApi):
     """API for running tests and processing test results."""
 
@@ -197,21 +192,12 @@
 
     def _create_led_build(self, orig_build, selftest_cl):
         builder = orig_build.builder
-        builder_lookup_name = "{project}/{bucket}:{builder}".format(
-            project=builder.project,
-            bucket=builder.bucket,
-            builder=builder.builder,
-        )
-        # Using `led get-builder` instead of `led get-build` ensures that we
-        # won't use an outdated version of the builder (e.g. with deprecated
-        # dimensions).
         # By default the priority is increased by 10 (resulting in a "lower"
         # priority), but we want it to stay the same.
         led_data = self.m.led(
-            "get-builder", "-adjust-priority", "0", builder_lookup_name
+            "get-build", "-adjust-priority", "0", orig_build.id
         )
 
-        led_data = led_data.then("edit", "-name", led_task_name(builder.builder))
         build = Build(api=self.m, name=builder.builder, led_data=led_data)
 
         if orig_build.input.properties["recipe"] == "recipes":
@@ -488,7 +474,6 @@
 
         if not builds:
             return
-
         self.m.swarming_retry.run_and_present_tasks(builds)
 
     def _tryjob_properties(self):
diff --git a/recipe_modules/recipe_testing/test_api.py b/recipe_modules/recipe_testing/test_api.py
index 3b5149c..79bfd72 100644
--- a/recipe_modules/recipe_testing/test_api.py
+++ b/recipe_modules/recipe_testing/test_api.py
@@ -92,17 +92,15 @@
         if not using_led:
             return result
 
-        # It's unrealistic for the get-builder response to have a task ID set,
+        # It's unrealistic for the get-build response to have a task ID set,
         # but the only way of mocking the task ID returned by `led launch` is
         # to set the task ID on the input to `led launch`, which, for recipe
-        # testing, is the `led get-builder` response.
+        # testing, is the `led get-build` response.
         build.infra.swarming.task_id = str(fake_id)
         job.buildbucket.bbagent_args.build.CopyFrom(build)
-        result += self.m.led.mock_get_builder(
+        result += self.m.led.mock_get_build(
             job,
-            project=project,
-            bucket=bucket,
-            builder=name,
+            fake_id,
         )
 
         if recipe != "recipes" and not cl_cached:
diff --git a/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json b/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
index 38f7cbf..ddf0734 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
@@ -338,10 +338,10 @@
   {
     "cmd": [
       "led",
-      "get-builder",
+      "get-build",
       "-adjust-priority",
       "0",
-      "flutter/try:fuchsia/try/core.arm64-debug"
+      "200"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -357,7 +357,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led get-builder",
+    "name": "get builders.fuchsia/try/core.arm64-debug.led get-build",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -371,7 +371,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -401,71 +401,6 @@
   },
   {
     "cmd": [
-      "led",
-      "edit",
-      "-name",
-      "recipes-cq:fuchsia/try/core.arm64-debug"
-    ],
-    "cwd": "[START_DIR]/recipe_path",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led edit",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@proto.output@{@@@",
-      "@@@STEP_LOG_LINE@proto.output@  \"buildbucket\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"bbagent_args\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@      \"build\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"builder\": \"fuchsia/try/core.arm64-debug\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"project\": \"flutter\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"priority\": 34500,@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"task_id\": \"200\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"gitiles_commit\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"host\": \"chromium.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"project\": \"flutter\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"ref\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        }@@@",
-      "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@  }@@@",
-      "@@@STEP_LOG_LINE@proto.output@}@@@",
-      "@@@STEP_LOG_END@proto.output@@@"
-    ]
-  },
-  {
-    "cmd": [
       "git",
       "ls-remote",
       "--symref",
@@ -669,7 +604,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.arm64-debug.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -683,7 +618,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -711,8 +646,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -739,8 +673,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.arm64-debug.led edit",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -754,7 +688,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -786,8 +720,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -814,8 +747,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.arm64-debug.led edit (2)",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -829,7 +762,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -861,8 +794,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -888,7 +820,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.arm64-debug.led edit-recipe-bundle",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -902,7 +834,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"buildbucket\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"agent\": {@@@",
@@ -953,8 +885,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1010,10 +941,10 @@
   {
     "cmd": [
       "led",
-      "get-builder",
+      "get-build",
       "-adjust-priority",
       "0",
-      "flutter/try:fuchsia/try/core.x64-debug"
+      "100"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -1029,7 +960,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.x64-debug.led get-builder",
+    "name": "get builders.fuchsia/try/core.x64-debug.led get-build",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1043,7 +974,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1074,71 +1005,6 @@
   {
     "cmd": [
       "led",
-      "edit",
-      "-name",
-      "recipes-cq:fuchsia/try/core.x64-debug"
-    ],
-    "cwd": "[START_DIR]/recipe_path",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get builders.fuchsia/try/core.x64-debug.led edit",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@proto.output@{@@@",
-      "@@@STEP_LOG_LINE@proto.output@  \"buildbucket\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"bbagent_args\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@      \"build\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"builder\": \"fuchsia/try/core.x64-debug\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"project\": \"flutter\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"priority\": 34500,@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"task_id\": \"100\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"gitiles_commit\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"host\": \"chromium.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"project\": \"flutter\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"ref\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        }@@@",
-      "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@  }@@@",
-      "@@@STEP_LOG_LINE@proto.output@}@@@",
-      "@@@STEP_LOG_END@proto.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "led",
       "edit-cr-cl",
       "https://flutter-review.googlesource.com/c/flutter/+/0/0"
     ],
@@ -1157,7 +1023,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.x64-debug.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1171,7 +1037,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1199,8 +1065,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1227,8 +1092,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.x64-debug.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.x64-debug.led edit",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1242,7 +1107,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1274,8 +1139,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1302,8 +1166,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.x64-debug.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.x64-debug.led edit (2)",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1317,7 +1181,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1349,8 +1213,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1376,7 +1239,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.x64-debug.led edit-recipe-bundle",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1390,7 +1253,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"buildbucket\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"agent\": {@@@",
@@ -1441,8 +1304,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1495,7 +1357,7 @@
       }
     },
     "name": "launch/collect.0.launch.fuchsia/try/core.arm64-debug (attempt 0).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1536,7 +1398,7 @@
       }
     },
     "name": "launch/collect.0.launch.fuchsia/try/core.x64-debug (attempt 0).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"host\": \"flutter-review.googlesource.com\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes.json b/recipe_modules/recipe_testing/tests/full.expected/recipes.json
index 76fc0dd..0f26ffe 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes.json
@@ -293,10 +293,10 @@
   {
     "cmd": [
       "led",
-      "get-builder",
+      "get-build",
       "-adjust-priority",
       "0",
-      "flutter/try:fuchsia/try/recipes"
+      "100"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -312,7 +312,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/recipes.led get-builder",
+    "name": "get builders.fuchsia/try/recipes.led get-build",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -326,7 +326,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -357,71 +357,6 @@
   {
     "cmd": [
       "led",
-      "edit",
-      "-name",
-      "recipes-cq:fuchsia/try/recipes"
-    ],
-    "cwd": "[START_DIR]/recipe_path",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get builders.fuchsia/try/recipes.led edit",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    }\n  }\n}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@proto.output@{@@@",
-      "@@@STEP_LOG_LINE@proto.output@  \"buildbucket\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"bbagent_args\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@      \"build\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"builder\": \"fuchsia/try/recipes\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"project\": \"flutter\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"priority\": 34500,@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"task_id\": \"100\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"gitiles_commit\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"host\": \"chromium.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"project\": \"flutter\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"ref\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"recipes\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        }@@@",
-      "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/recipes\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@  }@@@",
-      "@@@STEP_LOG_LINE@proto.output@}@@@",
-      "@@@STEP_LOG_END@proto.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "led",
       "edit-cr-cl",
       "https://flutter-review.googlesource.com/c/recipes/+/123456"
     ],
@@ -440,7 +375,7 @@
       }
     },
     "name": "get builders.fuchsia/try/recipes.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/recipes\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -454,7 +389,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -484,8 +419,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/recipes\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -512,8 +446,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/recipes.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/recipes\"\n  }\n}",
+    "name": "get builders.fuchsia/try/recipes.led edit",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -527,7 +461,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -561,8 +495,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/recipes\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -589,8 +522,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/recipes.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/recipes\"\n  }\n}",
+    "name": "get builders.fuchsia/try/recipes.led edit (2)",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -604,7 +537,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -638,8 +571,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/recipes\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -665,7 +597,7 @@
       }
     },
     "name": "get builders.fuchsia/try/recipes.led edit-recipe-bundle",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/recipes\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -679,7 +611,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"buildbucket\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"agent\": {@@@",
@@ -732,8 +664,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/recipes\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -786,7 +717,7 @@
       }
     },
     "name": "launch/collect.0.launch.fuchsia/try/recipes (attempt 0).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/recipes\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/recipes\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"123456\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"1337\",\n              \"project\": \"recipes\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"recipes\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json b/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
index bb0e710..1885ac4 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
@@ -342,10 +342,10 @@
   {
     "cmd": [
       "led",
-      "get-builder",
+      "get-build",
       "-adjust-priority",
       "0",
-      "flutter/try:fuchsia/try/core.arm64-debug"
+      "200"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -361,7 +361,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led get-builder",
+    "name": "get builders.fuchsia/try/core.arm64-debug.led get-build",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -375,7 +375,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -405,71 +405,6 @@
   },
   {
     "cmd": [
-      "led",
-      "edit",
-      "-name",
-      "recipes-cq:fuchsia/try/core.arm64-debug"
-    ],
-    "cwd": "[START_DIR]/recipe_path",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led edit",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@proto.output@{@@@",
-      "@@@STEP_LOG_LINE@proto.output@  \"buildbucket\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"bbagent_args\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@      \"build\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"builder\": \"fuchsia/try/core.arm64-debug\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"project\": \"flutter\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"priority\": 34500,@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"task_id\": \"200\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"gitiles_commit\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"host\": \"chromium.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"project\": \"flutter\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"ref\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        }@@@",
-      "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@  }@@@",
-      "@@@STEP_LOG_LINE@proto.output@}@@@",
-      "@@@STEP_LOG_END@proto.output@@@"
-    ]
-  },
-  {
-    "cmd": [
       "git",
       "ls-remote",
       "--symref",
@@ -876,7 +811,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.arm64-debug.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -890,7 +825,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -920,8 +855,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -948,8 +882,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.arm64-debug.led edit",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -963,7 +897,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -997,8 +931,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1025,8 +958,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.arm64-debug.led edit (2)",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1040,7 +973,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1074,8 +1007,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1101,7 +1033,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.arm64-debug.led edit-recipe-bundle",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1115,7 +1047,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"200\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"buildbucket\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"agent\": {@@@",
@@ -1168,8 +1100,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1225,10 +1156,10 @@
   {
     "cmd": [
       "led",
-      "get-builder",
+      "get-build",
       "-adjust-priority",
       "0",
-      "flutter/try:fuchsia/try/core.x64-debug"
+      "100"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -1244,7 +1175,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.x64-debug.led get-builder",
+    "name": "get builders.fuchsia/try/core.x64-debug.led get-build",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1258,7 +1189,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1289,71 +1220,6 @@
   {
     "cmd": [
       "led",
-      "edit",
-      "-name",
-      "recipes-cq:fuchsia/try/core.x64-debug"
-    ],
-    "cwd": "[START_DIR]/recipe_path",
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "get builders.fuchsia/try/core.x64-debug.led edit",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@proto.output@{@@@",
-      "@@@STEP_LOG_LINE@proto.output@  \"buildbucket\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"bbagent_args\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@      \"build\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"builder\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"bucket\": \"try\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"builder\": \"fuchsia/try/core.x64-debug\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"project\": \"flutter\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"swarming\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"priority\": 34500,@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"task_id\": \"100\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        },@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"input\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"gitiles_commit\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"host\": \"chromium.googlesource.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"project\": \"flutter\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"ref\": \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          },@@@",
-      "@@@STEP_LOG_LINE@proto.output@          \"properties\": {@@@",
-      "@@@STEP_LOG_LINE@proto.output@            \"recipe\": \"fuchsia\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@          }@@@",
-      "@@@STEP_LOG_LINE@proto.output@        }@@@",
-      "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
-      "@@@STEP_LOG_LINE@proto.output@  }@@@",
-      "@@@STEP_LOG_LINE@proto.output@}@@@",
-      "@@@STEP_LOG_END@proto.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "led",
       "edit-cr-cl",
       "https://flutter-review.googlesource.com/c/flutter/+/12345/6"
     ],
@@ -1372,7 +1238,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.x64-debug.led edit-cr-cl",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1386,7 +1252,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1416,8 +1282,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1444,8 +1309,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.x64-debug.led edit (2)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.x64-debug.led edit",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1459,7 +1324,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1493,8 +1358,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1521,8 +1385,8 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.x64-debug.led edit (3)",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "name": "get builders.fuchsia/try/core.x64-debug.led edit (2)",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1536,7 +1400,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"resultdb\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"invocation\": \"invocations/build:8945511751514863184\"@@@",
@@ -1570,8 +1434,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1597,7 +1460,7 @@
       }
     },
     "name": "get builders.fuchsia/try/core.x64-debug.led edit-recipe-bundle",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -1611,7 +1474,7 @@
       "@@@STEP_LOG_LINE@proto.output@        },@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"create_time\": \"2018-05-25T23:50:17Z\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",@@@",
-      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"8945511751514863184\",@@@",
+      "@@@STEP_LOG_LINE@proto.output@        \"id\": \"100\",@@@",
       "@@@STEP_LOG_LINE@proto.output@        \"infra\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@          \"buildbucket\": {@@@",
       "@@@STEP_LOG_LINE@proto.output@            \"agent\": {@@@",
@@ -1664,8 +1527,7 @@
       "@@@STEP_LOG_LINE@proto.output@          }@@@",
       "@@@STEP_LOG_LINE@proto.output@        }@@@",
       "@@@STEP_LOG_LINE@proto.output@      }@@@",
-      "@@@STEP_LOG_LINE@proto.output@    },@@@",
-      "@@@STEP_LOG_LINE@proto.output@    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@    }@@@",
       "@@@STEP_LOG_LINE@proto.output@  }@@@",
       "@@@STEP_LOG_LINE@proto.output@}@@@",
       "@@@STEP_LOG_END@proto.output@@@"
@@ -1718,7 +1580,7 @@
       }
     },
     "name": "launch/collect.0.launch.fuchsia/try/core.arm64-debug (attempt 0).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.arm64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.arm64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"200\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"200\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1759,7 +1621,7 @@
       }
     },
     "name": "launch/collect.0.launch.fuchsia/try/core.x64-debug (attempt 0).led launch",
-    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"8945511751514863184\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    },\n    \"name\": \"recipes-cq:fuchsia/try/core.x64-debug\"\n  }\n}",
+    "stdin": "{\n  \"buildbucket\": {\n    \"bbagent_args\": {\n      \"build\": {\n        \"builder\": {\n          \"bucket\": \"try\",\n          \"builder\": \"fuchsia/try/core.x64-debug\",\n          \"project\": \"flutter\"\n        },\n        \"create_time\": \"2018-05-25T23:50:17Z\",\n        \"created_by\": \"user:luci-scheduler@appspot.gserviceaccount.com\",\n        \"id\": \"100\",\n        \"infra\": {\n          \"buildbucket\": {\n            \"agent\": {\n              \"input\": {\n                \"data\": {\n                  \"kitchen-checkout\": {\n                    \"cas\": {\n                      \"digest\": {\n                        \"hash\": \"9095eb4fe66a5a67626c5af808e1298598a94bfc48e07c7232161b1128bac0be\",\n                        \"size_bytes\": \"1337\"\n                      }\n                    }\n                  }\n                }\n              },\n              \"purposes\": {\n                \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n              }\n            }\n          },\n          \"resultdb\": {\n            \"invocation\": \"invocations/build:8945511751514863184\"\n          },\n          \"swarming\": {\n            \"priority\": 34500,\n            \"task_id\": \"100\"\n          }\n        },\n        \"input\": {\n          \"gerrit_changes\": [\n            {\n              \"change\": \"12345\",\n              \"host\": \"flutter-review.googlesource.com\",\n              \"patchset\": \"6\",\n              \"project\": \"flutter\"\n            }\n          ],\n          \"gitiles_commit\": {\n            \"host\": \"chromium.googlesource.com\",\n            \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\",\n            \"project\": \"flutter\",\n            \"ref\": \"refs/heads/main\"\n          },\n          \"properties\": {\n            \"$flutter/recipe_testing\": {\n              \"enabled\": true,\n              \"recipe_depth\": 1.0\n            },\n            \"recipe\": \"fuchsia\"\n          }\n        }\n      }\n    }\n  }\n}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",