diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index e4aa0b6c3..8fe3dd6c5 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -15,7 +15,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "master",
-      "revision": "d0deba23a671b236ec535a9a54aa78b6dcf142ab",
+      "revision": "793d8faa696f62fa2c774b8c854bbf4d64dff24e",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index c4a1413fb..42e0e9c0f 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -981,18 +981,18 @@ Move things around in a loop!
 
 — **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):**
 
-[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-source_manifest
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d0deba23a671b236ec535a9a54aa78b6dcf142ab/recipe_engine/recipe_api.py#1015
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-source_manifest
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/793d8faa696f62fa2c774b8c854bbf4d64dff24e/recipe_engine/recipe_api.py#1015
diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
index 74e8cce99..94b7a8f50 100644
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
@@ -78,8 +78,10 @@
   },
   {
     "failure": {
-      "failure": {
-        "step": "bot_update"
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
       },
       "humanReason": "Infra Failure: Step('bot_update') returned 1"
     },
diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
index c7a387751..2e08b50ce 100644
--- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
@@ -169,8 +169,10 @@
   },
   {
     "failure": {
-      "failure": {
-        "step": "Patch failure"
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
       },
       "humanReason": "Infra Failure: Step('Patch failure') returned 1"
     },
diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json b/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
index 802d4d3c7..57937e7f7 100644
--- a/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
+++ b/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json
@@ -1,10 +1,12 @@
 [
   {
     "failure": {
-      "failure": {
-        "step": ""
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
       },
-      "humanReason": "invalid (host, project) pair in buildbucket.build.input.gitiles_commit: (u'unrecognized', u'repo') does not match any of configured gclient solutions and not present in gclient_config.repo_path_map"
+      "humanReason": "Infra Failure: Step(None) returned None"
     },
     "name": "$result"
   }
diff --git a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
index 02a5bb645..822de36c2 100644
--- a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
@@ -163,8 +163,10 @@
   },
   {
     "failure": {
-      "failure": {
-        "step": "git status can_fail_build"
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
       },
       "humanReason": "Infra Failure: Step('git status can_fail_build') returned 1"
     },
diff --git a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
index 8ea24d195..b76f344ab 100644
--- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
+++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
@@ -107,10 +107,12 @@
   },
   {
     "failure": {
-      "failure": {
-        "step": ""
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
       },
-      "humanReason": "count-objects failed: invalid literal for long() with base 10: 'xxx'"
+      "humanReason": "Infra Failure: Step(None) returned None"
     },
     "name": "$result"
   }
diff --git a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
index ffb704091..70b082f0b 100644
--- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
+++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
@@ -220,8 +220,10 @@
   },
   {
     "failure": {
-      "failure": {
-        "step": "my repo rebase"
+      "exception": {
+        "traceback": [
+          "<omitted by recipe engine>"
+        ]
       },
       "humanReason": "Infra Failure: Step('my repo rebase') returned 1"
     },