build_plan: Only run build_plan_generator if there are Gerrit changes.

The build_plan_generator only prunes child builders if there are Gerrit
changes passed in.

BUG=None
TEST=test train

Change-Id: I5681b7bfa466d11f6d234a0ea2c3e7daa900055a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/recipes/+/3300551
Reviewed-by: George Engelbrecht <engeg@google.com>
Commit-Queue: Navil Perez <navil@google.com>
diff --git a/recipe_modules/build_plan/api.py b/recipe_modules/build_plan/api.py
index f1d96cd..934c635 100644
--- a/recipe_modules/build_plan/api.py
+++ b/recipe_modules/build_plan/api.py
@@ -59,7 +59,7 @@
         self.m.cros_infra_config.get_builder_config(b.name) for b in child_specs
     ]
     necessary_builders = [b.id.name for b in builder_configs]
-    if not self._properties.disable_build_plan_pruning:
+    if gerrit_changes and not self._properties.disable_build_plan_pruning:
       necessary_builders = self.m.cros_relevance.get_necessary_builders(
           builder_configs, gerrit_changes, internal_snapshot, test_builder_ids=[
               b.id for b in builder_configs if 'pointless' not in b.id.name
diff --git a/recipe_modules/build_plan/examples/bisect_build_plan.expected/basic.json b/recipe_modules/build_plan/examples/bisect_build_plan.expected/basic.json
index 731b77b..c9fa0c6 100644
--- a/recipe_modules/build_plan/examples/bisect_build_plan.expected/basic.json
+++ b/recipe_modules/build_plan/examples/bisect_build_plan.expected/basic.json
@@ -36,249 +36,6 @@
   },
   {
     "cmd": [],
-    "name": "plan builds",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"\u0000",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "check force relevance",
     "~followup_annotations": [
       "@@@STEP_TEXT@force relevant 0 target(s)@@@",
diff --git a/recipe_modules/build_plan/examples/postsubmit_build_plan.expected/basic.json b/recipe_modules/build_plan/examples/postsubmit_build_plan.expected/basic.json
index 24ec2fc..0f310a8 100644
--- a/recipe_modules/build_plan/examples/postsubmit_build_plan.expected/basic.json
+++ b/recipe_modules/build_plan/examples/postsubmit_build_plan.expected/basic.json
@@ -36,249 +36,6 @@
   },
   {
     "cmd": [],
-    "name": "plan builds",
-    "~followup_annotations": [
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"\u0000",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "check force relevance",
     "~followup_annotations": [
       "@@@STEP_TEXT@force relevant 0 target(s)@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/basic.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/basic.json
index 6c3db14..69196ff 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/basic.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/basic.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-decoding.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-decoding.json
index 88f9a24..40b04ec 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-decoding.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-decoding.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading-but-forgiven.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading-but-forgiven.json
index 0fab4ce..7e31015 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading-but-forgiven.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading-but-forgiven.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading.json
index 63d3f74..b5217f0 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/failed-reading.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-artifacts.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-artifacts.json
index 82815c8..3194aca 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-artifacts.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-artifacts.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-build-target.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-build-target.json
index 761e8d2..a931c5b 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-build-target.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-build-target.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-child.json b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-child.json
index b69412f..d2cbf1a 100644
--- a/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-child.json
+++ b/recipe_modules/orch_menu/examples/aggregate_metadata.expected/skip-child.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/basic.json b/recipe_modules/orch_menu/examples/full.expected/basic.json
index e07b8f1..889bf9c 100644
--- a/recipe_modules/orch_menu/examples/full.expected/basic.json
+++ b/recipe_modules/orch_menu/examples/full.expected/basic.json
@@ -1684,252 +1684,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/branch.json b/recipe_modules/orch_menu/examples/full.expected/branch.json
index c744578..e1c6828 100644
--- a/recipe_modules/orch_menu/examples/full.expected/branch.json
+++ b/recipe_modules/orch_menu/examples/full.expected/branch.json
@@ -1721,252 +1721,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/chromium_src_ref_cq_cl_tag.json b/recipe_modules/orch_menu/examples/full.expected/chromium_src_ref_cq_cl_tag.json
index a912841..adc9aca 100644
--- a/recipe_modules/orch_menu/examples/full.expected/chromium_src_ref_cq_cl_tag.json
+++ b/recipe_modules/orch_menu/examples/full.expected/chromium_src_ref_cq_cl_tag.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/collect-children-timeout.json b/recipe_modules/orch_menu/examples/full.expected/collect-children-timeout.json
index a818840..7f6512b 100644
--- a/recipe_modules/orch_menu/examples/full.expected/collect-children-timeout.json
+++ b/recipe_modules/orch_menu/examples/full.expected/collect-children-timeout.json
@@ -1745,252 +1745,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/critical_child_builder_fails.json b/recipe_modules/orch_menu/examples/full.expected/critical_child_builder_fails.json
index 7ac318d..29f11a7 100644
--- a/recipe_modules/orch_menu/examples/full.expected/critical_child_builder_fails.json
+++ b/recipe_modules/orch_menu/examples/full.expected/critical_child_builder_fails.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/existing-annealing-builds.json b/recipe_modules/orch_menu/examples/full.expected/existing-annealing-builds.json
index 2817494..3b90688 100644
--- a/recipe_modules/orch_menu/examples/full.expected/existing-annealing-builds.json
+++ b/recipe_modules/orch_menu/examples/full.expected/existing-annealing-builds.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/non-crit-test-check-updates.json b/recipe_modules/orch_menu/examples/full.expected/non-crit-test-check-updates.json
index 5039581..b269717 100644
--- a/recipe_modules/orch_menu/examples/full.expected/non-crit-test-check-updates.json
+++ b/recipe_modules/orch_menu/examples/full.expected/non-crit-test-check-updates.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/non-critical_child_builder_fails.json b/recipe_modules/orch_menu/examples/full.expected/non-critical_child_builder_fails.json
index d76906a..35e1a18 100644
--- a/recipe_modules/orch_menu/examples/full.expected/non-critical_child_builder_fails.json
+++ b/recipe_modules/orch_menu/examples/full.expected/non-critical_child_builder_fails.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/release-orchestrator.json b/recipe_modules/orch_menu/examples/full.expected/release-orchestrator.json
index b0f1319..465a135 100644
--- a/recipe_modules/orch_menu/examples/full.expected/release-orchestrator.json
+++ b/recipe_modules/orch_menu/examples/full.expected/release-orchestrator.json
@@ -3105,260 +3105,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@2 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"main-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"eve-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  orchestrator {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      host: \"chrome-internal.googlesource.com\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      project: \"chromeos/manifest-internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      ref: \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"kukui-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  orchestrator {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      host: \"chrome-internal.googlesource.com\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      project: \"chromeos/manifest-internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      ref: \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: NONE@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-releases-test\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: AUTOTEST_FILES@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: TAST_FILES@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: PINNED_GUEST_IMAGES@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: EBUILD_LOGS@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: TEST_UPDATE_PAYLOAD@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: DEBUG_SYMBOLS@@@",
-      "@@@STEP_LOG_LINE@planner_input@          gs_locations: \"chromeos-releases-test/{target}-release/{version}\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: DLC_IMAGE@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      infra {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: BUILD_MANIFEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"-cros-debug\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    apply_gerrit_changes: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_RECOVERY@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      compile_source: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\rmain-HEAD-SHA\\\"\\017refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"eve-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"kukui-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\rmain-HEAD-SHA\u001aq\n\u0014\n\u0010eve-main-release\u0018\u0005\u0012\u0006\n\u0002\b\u00018\u0002\u001aQ\u0012O\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\"\u000frefs/heads/main\u001a\ufffd\u0002\n\u0016\n\u0012kukui-main-release\u0018\u0005\u0012\u0006\n\u0002\b\u00018\u0002\u001aQ\u0012O\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\"\u000frefs/heads/main\"j\b\u0003\"\u0016chromeos-releases-testBN\n>\u0012<\n\u0007\u0001\u0003\u0004\u0005\u0007\u0002 \u00121chromeos-releases-test/{target}-release/{version}\u001a\u0005\u0012\u0003\n\u0001\"J\u0005\u0012\u0003\n\u0001$*\u0002\b\u000124\n\u0011\n\u000fchrome_internal\n\r\n\u000b-cros-debug0\u0001z\u0005\n\u0003\u0001\u0003\u0006\ufffd\u0001\u0006\b\u0001\u0010\u0002(\u0001:\u0004(\u0002@\u0001\"`\n^\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\rmain-HEAD-SHA\"\u000frefs/heads/main",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "--manifest_file",
-      "[CLEANUP]/chromiumos_workspace/manifest-internal/default.xml"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/test-failure.json b/recipe_modules/orch_menu/examples/full.expected/test-failure.json
index 2d067f1..22d13d3 100644
--- a/recipe_modules/orch_menu/examples/full.expected/test-failure.json
+++ b/recipe_modules/orch_menu/examples/full.expected/test-failure.json
@@ -1684,252 +1684,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipe_modules/orch_menu/examples/full.expected/with-test-bisection.json b/recipe_modules/orch_menu/examples/full.expected/with-test-bisection.json
index e395be2..ca821bd 100644
--- a/recipe_modules/orch_menu/examples/full.expected/with-test-bisection.json
+++ b/recipe_modules/orch_menu/examples/full.expected/with-test-bisection.json
@@ -1639,206 +1639,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@1 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:bisect"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/afdo_orchestrator.expected/basic.json b/recipes/afdo_orchestrator.expected/basic.json
index 0260ea8..5d812ae 100644
--- a/recipes/afdo_orchestrator.expected/basic.json
+++ b/recipes/afdo_orchestrator.expected/basic.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/basic.json b/recipes/orchestrator.expected/basic.json
index e0fde51..124bae6 100644
--- a/recipes/orchestrator.expected/basic.json
+++ b/recipes/orchestrator.expected/basic.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/bisecting-orchestrator.json b/recipes/orchestrator.expected/bisecting-orchestrator.json
index 78bb79a..9ff38d2 100644
--- a/recipes/orchestrator.expected/bisecting-orchestrator.json
+++ b/recipes/orchestrator.expected/bisecting-orchestrator.json
@@ -1639,159 +1639,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@0 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/chromium-src-ref-cq-cl-tag.json b/recipes/orchestrator.expected/chromium-src-ref-cq-cl-tag.json
index bf7b5e7..afac23c 100644
--- a/recipes/orchestrator.expected/chromium-src-ref-cq-cl-tag.json
+++ b/recipes/orchestrator.expected/chromium-src-ref-cq-cl-tag.json
@@ -1625,252 +1625,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/critical_child_builder_fails.json b/recipes/orchestrator.expected/critical_child_builder_fails.json
index 6ebe78f..aee83b9 100644
--- a/recipes/orchestrator.expected/critical_child_builder_fails.json
+++ b/recipes/orchestrator.expected/critical_child_builder_fails.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/does_not_update_refs.json b/recipes/orchestrator.expected/does_not_update_refs.json
index 6ebe78f..aee83b9 100644
--- a/recipes/orchestrator.expected/does_not_update_refs.json
+++ b/recipes/orchestrator.expected/does_not_update_refs.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/joinable_existing_annealing_builds.json b/recipes/orchestrator.expected/joinable_existing_annealing_builds.json
index 0dcf8ff..b5d18bc 100644
--- a/recipes/orchestrator.expected/joinable_existing_annealing_builds.json
+++ b/recipes/orchestrator.expected/joinable_existing_annealing_builds.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/missing_gitiles_commit.json b/recipes/orchestrator.expected/missing_gitiles_commit.json
index 6781a3b..6bbc391 100644
--- a/recipes/orchestrator.expected/missing_gitiles_commit.json
+++ b/recipes/orchestrator.expected/missing_gitiles_commit.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/missing_gitiles_commit_with_defaults.json b/recipes/orchestrator.expected/missing_gitiles_commit_with_defaults.json
index 6781a3b..6bbc391 100644
--- a/recipes/orchestrator.expected/missing_gitiles_commit_with_defaults.json
+++ b/recipes/orchestrator.expected/missing_gitiles_commit_with_defaults.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/non-critical_child_builder_fails.json b/recipes/orchestrator.expected/non-critical_child_builder_fails.json
index 66d4247..712b657 100644
--- a/recipes/orchestrator.expected/non-critical_child_builder_fails.json
+++ b/recipes/orchestrator.expected/non-critical_child_builder_fails.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/release-orchestrator.json b/recipes/orchestrator.expected/release-orchestrator.json
index 882f1a3..53803c6 100644
--- a/recipes/orchestrator.expected/release-orchestrator.json
+++ b/recipes/orchestrator.expected/release-orchestrator.json
@@ -3165,260 +3165,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@2 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"main-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"eve-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  orchestrator {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      host: \"chrome-internal.googlesource.com\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      project: \"chromeos/manifest-internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      ref: \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"kukui-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  orchestrator {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      host: \"chrome-internal.googlesource.com\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      project: \"chromeos/manifest-internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@      ref: \"refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: NONE@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-releases-test\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: AUTOTEST_FILES@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: TAST_FILES@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: PINNED_GUEST_IMAGES@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: EBUILD_LOGS@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: TEST_UPDATE_PAYLOAD@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: DEBUG_SYMBOLS@@@",
-      "@@@STEP_LOG_LINE@planner_input@          gs_locations: \"chromeos-releases-test/{target}-release/{version}\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: DLC_IMAGE@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      infra {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: BUILD_MANIFEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"-cros-debug\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    apply_gerrit_changes: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_RECOVERY@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      compile_source: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\rmain-HEAD-SHA\\\"\\017refs/heads/main\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"eve-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"kukui-main-release\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: RELEASE@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\rmain-HEAD-SHA\u001aq\n\u0014\n\u0010eve-main-release\u0018\u0005\u0012\u0006\n\u0002\b\u00018\u0002\u001aQ\u0012O\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\"\u000frefs/heads/main\u001a\ufffd\u0002\n\u0016\n\u0012kukui-main-release\u0018\u0005\u0012\u0006\n\u0002\b\u00018\u0002\u001aQ\u0012O\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\"\u000frefs/heads/main\"j\b\u0003\"\u0016chromeos-releases-testBN\n>\u0012<\n\u0007\u0001\u0003\u0004\u0005\u0007\u0002 \u00121chromeos-releases-test/{target}-release/{version}\u001a\u0005\u0012\u0003\n\u0001\"J\u0005\u0012\u0003\n\u0001$*\u0002\b\u000124\n\u0011\n\u000fchrome_internal\n\r\n\u000b-cros-debug0\u0001z\u0005\n\u0003\u0001\u0003\u0006\ufffd\u0001\u0006\b\u0001\u0010\u0002(\u0001:\u0004(\u0002@\u0001\"`\n^\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\rmain-HEAD-SHA\"\u000frefs/heads/main",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "--manifest_file",
-      "[CLEANUP]/chromiumos_workspace/manifest-internal/default.xml"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
diff --git a/recipes/orchestrator.expected/updates_refs.json b/recipes/orchestrator.expected/updates_refs.json
index f943159..bf1411d 100644
--- a/recipes/orchestrator.expected/updates_refs.json
+++ b/recipes/orchestrator.expected/updates_refs.json
@@ -1744,252 +1744,6 @@
   },
   {
     "cmd": [],
-    "name": "run builds.plan builds",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_TEXT@3 relevant, 0 irrelevant builder configs@@@",
-      "@@@STEP_LOG_LINE@planner_input@manifest_commit: \"snapshot-HEAD-SHA\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      value: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@    prebuilts_gs_bucket: \"chromeos-prebuilt\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_gs_bucket: \"chromeos-image-archive\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    artifacts_info {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      legacy {@@@",
-      "@@@STEP_LOG_LINE@planner_input@        output_artifacts {@@@",
-      "@@@STEP_LOG_LINE@planner_input@          artifact_types: IMAGE_ZIP@@@",
-      "@@@STEP_LOG_LINE@planner_input@        }@@@",
-      "@@@STEP_LOG_LINE@planner_input@      }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  chrome {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    internal: true@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    use_flags {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      flag: \"chrome_internal\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    build_images {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_BASE@@@",
-      "@@@STEP_LOG_LINE@planner_input@      image_types: IMAGE_TYPE_TEST@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PUBLIC@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@builder_configs {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  id {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@    type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  general {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    critical {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@    manifest: PRIVATE@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  build {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    install_packages {@@@",
-      "@@@STEP_LOG_LINE@planner_input@      run_spec: RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@      dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@    }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@  unit_tests {@@@",
-      "@@@STEP_LOG_LINE@planner_input@    ebuilds_run_spec: NO_RUN@@@",
-      "@@@STEP_LOG_LINE@planner_input@    dependencies: ALL_DEPENDENCIES@@@",
-      "@@@STEP_LOG_LINE@planner_input@  }@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_LINE@planner_input@gitiles_commit {@@@",
-      "@@@STEP_LOG_LINE@planner_input@  serialized_proto: \"\\n chrome-internal.googlesource.com\\022\\032chromeos/manifest-internal\\032\\021snapshot-HEAD-SHA\\\"\\023refs/heads/snapshot\"@@@",
-      "@@@STEP_LOG_LINE@planner_input@}@@@",
-      "@@@STEP_LOG_END@planner_input@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"amd64-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"arm-generic-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_LINE@planner_output@builds_to_run {@@@",
-      "@@@STEP_LOG_LINE@planner_output@  name: \"grunt-postsubmit\"@@@",
-      "@@@STEP_LOG_LINE@planner_output@  type: POSTSUBMIT@@@",
-      "@@@STEP_LOG_LINE@planner_output@}@@@",
-      "@@@STEP_LOG_END@planner_output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "run builds.plan builds.ensure binaries",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "chromiumos/infra/build_plan_generator/${platform} prod\nchromiumos/infra/pointless_build_checker/${platform} prod",
-      "-max-threads",
-      "0",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.ensure binaries.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/build_plan_generator/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-prod------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"chromiumos/infra/pointless_build_checker/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "\u0012\u0011snapshot-HEAD-SHA\u001a\ufffd\u0001\n\u001c\n\u0018amd64-generic-postsubmit\u0018\u0002\u0012\u0006\n\u0002\b\u00018\u0001\"6\b\u0001\u001a\u0011chromeos-prebuilt\"\u0016chromeos-image-archiveB\u0007\n\u0005\u0012\u0003\n\u0001\u0001*\u0002\b\u00012 \n\u0011\n\u000fchrome_internalz\u0004\n\u0002\u0001\u0003\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0002@\u0001\u001a+\n\u001a\n\u0016arm-generic-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00012\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001\u001a+\n\u0014\n\u0010grunt-postsubmit\u0018\u0002\u0012\u0004\n\u00008\u00022\u0007\ufffd\u0001\u0004\u0010\u0002(\u0001:\u0004(\u0001@\u0001\"h\nf\n chrome-internal.googlesource.com\u0012\u001achromeos/manifest-internal\u001a\u0011snapshot-HEAD-SHA\"\u0013refs/heads/snapshot",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.write input binaryproto",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/build_plan_generator",
-      "generate-plan",
-      "--input_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/input.binaryproto",
-      "--output_binary_pb",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.run planner",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/build-plan-_tmp_1/output.binaryproto",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "chromeos:postsubmit"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "run builds.plan builds.read output file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "run builds.check force relevance",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",