diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 74879b1117..899c1a9d66 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -17,7 +17,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "8de157ed85b17666cdfb49b08f75208a63dc34eb",
+      "revision": "28ab5d8464249c86f6a204c89381ea395304c0c2",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index 7c385fd1ee..6fbe824617 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -1298,29 +1298,29 @@ Move things around in a loop!
 
 — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#15)(api):**
 
-[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-archive
-[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-assertions
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-commit_position
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-cq
-[recipe_engine/recipe_modules/cv]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-cv
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/findings]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-findings
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-led
-[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-milo
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/proto]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-proto
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-resultdb
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-time
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-url
-[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-version
-[recipe_engine/recipe_modules/warning]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/README.recipes.md#recipe_modules-warning
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8de157ed85b17666cdfb49b08f75208a63dc34eb/recipe_engine/recipe_api.py#439
+[recipe_engine/recipe_modules/archive]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-archive
+[recipe_engine/recipe_modules/assertions]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-assertions
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/commit_position]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-commit_position
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/cq]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-cq
+[recipe_engine/recipe_modules/cv]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-cv
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/findings]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-findings
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/led]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-led
+[recipe_engine/recipe_modules/milo]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-milo
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/proto]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-proto
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-resultdb
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/time]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-time
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-url
+[recipe_engine/recipe_modules/version]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-version
+[recipe_engine/recipe_modules/warning]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/README.recipes.md#recipe_modules-warning
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/28ab5d8464249c86f6a204c89381ea395304c0c2/recipe_engine/recipe_api.py#439
diff --git a/recipes/recipe_modules/bot_update/tests/ensure_checkout_turboci_checks.py b/recipes/recipe_modules/bot_update/tests/ensure_checkout_turboci_checks.py
index b1337533e6..7bb6e496dc 100644
--- a/recipes/recipe_modules/bot_update/tests/ensure_checkout_turboci_checks.py
+++ b/recipes/recipe_modules/bot_update/tests/ensure_checkout_turboci_checks.py
@@ -78,14 +78,14 @@ def GenTests(api):
 
   def check_ci_graph_assert(assert_, graph: GraphView):
     check_id = 'fake-check-id'
-    check_view = graph.checks[check_id]
+    check = graph.checks[check_id].check
     assert_(list(graph.checks.keys()) == [check_id])
 
-    assert_(check_view.check.kind == CheckKind.CHECK_KIND_SOURCE)
-    assert_(check_view.check.state == CheckState.CHECK_STATE_FINAL)
+    assert_(check.kind == CheckKind.CHECK_KIND_SOURCE)
+    assert_(check.state == CheckState.CHECK_STATE_FINAL)
 
     gob_source_check_options = turboci.get_option(GobSourceCheckOptions,
-                                                  check_view)
+                                                  check)
     expected_gob_source_check_options = GobSourceCheckOptions(
         base_pinned_repos=GobSourceCheckOptions.PinnedRepoMounts(
             mount_overrides=[
@@ -107,13 +107,13 @@ def GenTests(api):
     assert_(gob_source_check_options == expected_gob_source_check_options)
 
     gob_source_check_results = turboci.get_results(GobSourceCheckResults,
-                                                   check_view)
+                                                   check)
     expected_gob_source_check_results = [
         GobSourceCheckResults(),
     ]
     assert_(gob_source_check_results == expected_gob_source_check_results)
 
-    bot_update_check_results = turboci.get_results(BotUpdateResults, check_view)
+    bot_update_check_results = turboci.get_results(BotUpdateResults, check)
     expected_bot_update_check_results = [
         BotUpdateResults(
             manifest={
@@ -155,14 +155,14 @@ def GenTests(api):
 
   def check_ci_revision_only_graph_assert(assert_, graph: GraphView):
     check_id = 'fake-check-id'
-    check_view = graph.checks[check_id]
+    check = graph.checks[check_id].check
     assert_(list(graph.checks.keys()) == [check_id])
 
-    assert_(check_view.check.kind == CheckKind.CHECK_KIND_SOURCE)
-    assert_(check_view.check.state == CheckState.CHECK_STATE_FINAL)
+    assert_(check.kind == CheckKind.CHECK_KIND_SOURCE)
+    assert_(check.state == CheckState.CHECK_STATE_FINAL)
 
     gob_source_check_options = turboci.get_option(GobSourceCheckOptions,
-                                                  check_view)
+                                                  check)
     expected_gob_source_check_options = GobSourceCheckOptions(
         base_pinned_repos=GobSourceCheckOptions.PinnedRepoMounts(
             mount_overrides=[
@@ -180,13 +180,13 @@ def GenTests(api):
     assert_(gob_source_check_options == expected_gob_source_check_options)
 
     gob_source_check_results = turboci.get_results(GobSourceCheckResults,
-                                                   check_view)
+                                                   check)
     expected_gob_source_check_results = [
         GobSourceCheckResults(),
     ]
     assert_(gob_source_check_results == expected_gob_source_check_results)
 
-    bot_update_check_results = turboci.get_results(BotUpdateResults, check_view)
+    bot_update_check_results = turboci.get_results(BotUpdateResults, check)
     expected_bot_update_check_results = [
         BotUpdateResults(
             manifest={
@@ -228,14 +228,14 @@ def GenTests(api):
 
   def check_try_graph_assert(assert_, graph: GraphView):
     check_id = 'fake-check-id'
-    check_view = graph.checks[check_id]
+    check = graph.checks[check_id].check
     assert_(list(graph.checks.keys()) == [check_id])
 
-    assert_(check_view.check.kind == CheckKind.CHECK_KIND_SOURCE)
-    assert_(check_view.check.state == CheckState.CHECK_STATE_FINAL)
+    assert_(check.kind == CheckKind.CHECK_KIND_SOURCE)
+    assert_(check.state == CheckState.CHECK_STATE_FINAL)
 
     gob_source_check_options = turboci.get_option(GobSourceCheckOptions,
-                                                  check_view)
+                                                  check)
     expected_gob_source_check_options = GobSourceCheckOptions(
         gerrit_changes=[
             GobSourceCheckOptions.GerritChange(
@@ -262,7 +262,7 @@ def GenTests(api):
     assert_(gob_source_check_options == expected_gob_source_check_options)
 
     gob_source_check_results = turboci.get_results(GobSourceCheckResults,
-                                                   check_view)
+                                                   check)
     expected_gob_source_check_results = [
         GobSourceCheckResults(changes=[
             GerritChangeInfo(
@@ -277,7 +277,7 @@ def GenTests(api):
     ]
     assert_(gob_source_check_results == expected_gob_source_check_results)
 
-    bot_update_check_results = turboci.get_results(BotUpdateResults, check_view)
+    bot_update_check_results = turboci.get_results(BotUpdateResults, check)
     expected_bot_update_check_results = [
         BotUpdateResults(
             manifest={