diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index b43af4e..2067366 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -1243,7 +1243,10 @@
       stack.Add(osutils.TempDirContextManager, 'cbuildbot-tmp')
       logging.debug("Cbuildbot tempdir is %r.", os.environ.get('TMP'))
 
-    options.preserve_paths = set()
+    # TODO(ferringb): update this once https://gerrit.chromium.org/gerrit/25359
+    # is landed- it's sensitive to the manifest-versions cache path.
+    options.preserve_paths = set(['manifest-versions',
+                                  'manifest-versions-internal'])
     if log_file is not None:
       stack.Add(tee.Tee, log_file)
       options.preserve_paths.add(_DEFAULT_LOG_DIR)