diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 71a9449b3..6bd4a0302 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -15,7 +15,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "master",
-      "revision": "84b31ee25882e7f1b190dbed036fa6c3da0b53fc",
+      "revision": "5e53d73e9bcec42830e10b835bc328eb75c9423f",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md
index 3878f1568..e8481976e 100644
--- a/recipes/README.recipes.md
+++ b/recipes/README.recipes.md
@@ -975,18 +975,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/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-buildbucket
-[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-cipd
-[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-context
-[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-file
-[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-json
-[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-path
-[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-platform
-[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-properties
-[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-python
-[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-raw_io
-[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-runtime
-[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-source_manifest
-[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-step
-[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/README.recipes.md#recipe_modules-url
-[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/84b31ee25882e7f1b190dbed036fa6c3da0b53fc/recipe_engine/recipe_api.py#1015
+[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-buildbucket
+[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-cipd
+[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-context
+[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-file
+[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-json
+[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-path
+[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-platform
+[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-properties
+[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-python
+[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-raw_io
+[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-runtime
+[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-source_manifest
+[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-step
+[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/README.recipes.md#recipe_modules-url
+[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5e53d73e9bcec42830e10b835bc328eb75c9423f/recipe_engine/recipe_api.py#1015
diff --git a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
index 455751a81..222a8de38 100644
--- a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
@@ -53,7 +53,7 @@
       "description",
       "-d"
     ],
-    "cwd": "[TMP_BASE]/fakerepo_tmp_1",
+    "cwd": "[CLEANUP]/fakerepo_tmp_1",
     "name": "git_cl description",
     "stdout": "/path/to/tmp/"
   },
@@ -71,7 +71,7 @@
       "-n",
       "-"
     ],
-    "cwd": "[TMP_BASE]/fakerepo_tmp_1",
+    "cwd": "[CLEANUP]/fakerepo_tmp_1",
     "name": "git_cl set description (2)",
     "stdin": "new description woo",
     "stdout": "/path/to/tmp/"
@@ -82,7 +82,7 @@
       "description",
       "-d"
     ],
-    "cwd": "[TMP_BASE]/fakerepo_tmp_1",
+    "cwd": "[CLEANUP]/fakerepo_tmp_1",
     "name": "git_cl description (2)",
     "stdout": "/path/to/tmp/"
   },
diff --git a/recipes/recipes/fetch_end_to_end_test.expected/basic.json b/recipes/recipes/fetch_end_to_end_test.expected/basic.json
index d8c17680d..5fc927f03 100644
--- a/recipes/recipes/fetch_end_to_end_test.expected/basic.json
+++ b/recipes/recipes/fetch_end_to_end_test.expected/basic.json
@@ -88,7 +88,7 @@
       "[START_DIR]/depot_tools/fetch.py",
       "depot_tools"
     ],
-    "cwd": "[TMP_BASE]/fetch_end_to_end_test_depot_tools_tmp_1",
+    "cwd": "[CLEANUP]/fetch_end_to_end_test_depot_tools_tmp_1",
     "env": {
       "CHROME_HEADLESS": "1",
       "DEPOT_TOOLS_UPDATE": "0"
@@ -108,7 +108,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "[TMP_BASE]/fetch_end_to_end_test_depot_tools_tmp_1"
+      "[CLEANUP]/fetch_end_to_end_test_depot_tools_tmp_1"
     ],
     "env": {
       "CHROME_HEADLESS": "1",
@@ -129,7 +129,7 @@
       "[START_DIR]/depot_tools/fetch.py",
       "infra"
     ],
-    "cwd": "[TMP_BASE]/fetch_end_to_end_test_infra_tmp_2",
+    "cwd": "[CLEANUP]/fetch_end_to_end_test_infra_tmp_2",
     "env": {
       "CHROME_HEADLESS": "1",
       "DEPOT_TOOLS_UPDATE": "0"
@@ -149,7 +149,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "rmtree",
-      "[TMP_BASE]/fetch_end_to_end_test_infra_tmp_2"
+      "[CLEANUP]/fetch_end_to_end_test_infra_tmp_2"
     ],
     "env": {
       "CHROME_HEADLESS": "1",