diff --git a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json
index eb96cdc7d..03b35a193 100644
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_linux.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show paths",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
+      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
       "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
       "@@@STEP_LOG_END@result@@@"
     ]
diff --git a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json
index eb96cdc7d..03b35a193 100644
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_mac.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show paths",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
+      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
       "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
       "@@@STEP_LOG_END@result@@@"
     ]
diff --git a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json
index eb96cdc7d..03b35a193 100644
--- a/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json
+++ b/recipes/recipe_modules/infra_paths/examples/full.expected/paths_kitchen_win.json
@@ -3,7 +3,7 @@
     "cmd": [],
     "name": "show paths",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'build.dead'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
+      "@@@STEP_LOG_LINE@result@base_paths: {'builder_cache': ('/', 'b', 'c', 'b'), 'cache': ('/', 'b', 'c'), 'goma_cache': ('/', 'b', 'c', 'goma_cache'), 'start_dir': ('/', 'b', 'FakeTestingCWD'), 'cleanup': ('/', 'b', 'cleanup'), 'git_cache': ('/', 'b', 'c', 'git_cache'), 'root': ('/', 'b', 'FakeTestingCWD'), 'tmp_base': ('/',)}@@@",
       "@@@STEP_LOG_LINE@result@default_git_cache_dir: Path('git_cache')@@@",
       "@@@STEP_LOG_END@result@@@"
     ]
diff --git a/recipes/recipe_modules/infra_paths/path_config.py b/recipes/recipe_modules/infra_paths/path_config.py
index aaf7104a5..e39de94ef 100644
--- a/recipes/recipe_modules/infra_paths/path_config.py
+++ b/recipes/recipe_modules/infra_paths/path_config.py
@@ -30,7 +30,6 @@ def infra_buildbot(c):
 def infra_kitchen(c):
   """Used on BuildBot by "remote_run" when NOT running Kitchen."""
   c.base_paths['root'] = c.START_DIR
-  c.base_paths['cleanup'] = c.START_DIR[:-1] + ('build.dead',)
   # TODO(phajdan.jr): have one cache dir, let clients append suffixes.
 
   b_dir = c.START_DIR