diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py
index 54da3b3559..b2b51b30ac 100644
--- a/infra/bots/recipe_modules/vars/api.py
+++ b/infra/bots/recipe_modules/vars/api.py
@@ -108,7 +108,7 @@ class SkiaVarsApi(recipe_api.RecipeApi):
     self.default_env.update({'SKIA_OUT': self.skia_out,
                              'BUILDTYPE': self.configuration})
     self.is_trybot = self.builder_cfg['is_trybot']
-    self.patch_storage = self.m.properties.get('patch_storage', '')
+    self.patch_storage = self.m.properties.get('patch_storage', 'rietveld')
     self.issue = None
     self.patchset = None
     if self.is_trybot:
diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
index 207b4913cc..119502c4a5 100644
--- a/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_perf.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
@@ -167,7 +167,7 @@
       "patchset",
       "1",
       "patch_storage",
-      "",
+      "rietveld",
       "--key",
       "arch",
       "x86_64",
diff --git a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json
index 06179ebd6d..24ff80d572 100644
--- a/infra/bots/recipes/swarm_perf.expected/big_issue_number.json
+++ b/infra/bots/recipes/swarm_perf.expected/big_issue_number.json
@@ -167,7 +167,7 @@
       "patchset",
       "1",
       "patch_storage",
-      "",
+      "rietveld",
       "--key",
       "arch",
       "x86_64",
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index 1129a2cea4..9098ea7280 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -148,7 +148,7 @@
       "patchset",
       "1",
       "patch_storage",
-      "",
+      "rietveld",
       "--svgs",
       "[SLAVE_BUILD]/svg",
       "--key",
@@ -447,7 +447,7 @@
       "patchset",
       "1",
       "patch_storage",
-      ""
+      "rietveld"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
diff --git a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index 131ad96e3b..d54b9c6a74 100644
--- a/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipes/swarm_test.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
@@ -200,7 +200,7 @@
       "patchset",
       "1",
       "patch_storage",
-      "",
+      "rietveld",
       "--svgs",
       "[SLAVE_BUILD]\\svg",
       "--key",
diff --git a/infra/bots/recipes/swarm_test.expected/big_issue_number.json b/infra/bots/recipes/swarm_test.expected/big_issue_number.json
index 2efd0e83ac..708f6b3fbd 100644
--- a/infra/bots/recipes/swarm_test.expected/big_issue_number.json
+++ b/infra/bots/recipes/swarm_test.expected/big_issue_number.json
@@ -200,7 +200,7 @@
       "patchset",
       "1",
       "patch_storage",
-      "",
+      "rietveld",
       "--svgs",
       "[SLAVE_BUILD]\\svg",
       "--key",