default_timeout: Minor cleanups

Change-Id: I6687d7fae9e5b8fd21c822d405b516f7a5d82d5a
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/151812
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Anthony Fandrianto <atyfto@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/recipe_modules/build/tests/full.expected/default.json b/recipe_modules/build/tests/full.expected/default.json
index 3c74e61..8843d03 100644
--- a/recipe_modules/build/tests/full.expected/default.json
+++ b/recipe_modules/build/tests/full.expected/default.json
@@ -11,7 +11,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 38s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -22,7 +22,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "ninja"
diff --git a/recipe_modules/build/tests/full.expected/full.json b/recipe_modules/build/tests/full.expected/full.json
index d29af46..7f7136f 100644
--- a/recipe_modules/build/tests/full.expected/full.json
+++ b/recipe_modules/build/tests/full.expected/full.json
@@ -30,7 +30,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 38s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -42,7 +42,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "ninja"
diff --git a/recipe_modules/checkout/tests/git.expected/ci.json b/recipe_modules/checkout/tests/git.expected/ci.json
index a777ab6..1788fd9 100644
--- a/recipe_modules/checkout/tests/git.expected/ci.json
+++ b/recipe_modules/checkout/tests/git.expected/ci.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
index 5c6407c..468b8c8 100644
--- a/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
+++ b/recipe_modules/checkout/tests/git.expected/not_in_gerrit.json
@@ -266,7 +266,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -284,12 +284,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -328,7 +322,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -346,12 +340,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -401,7 +389,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -422,7 +410,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -437,12 +425,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -459,12 +441,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -480,12 +456,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -505,12 +475,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -526,12 +490,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -546,12 +504,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -568,12 +520,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -595,12 +541,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -620,12 +560,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -656,7 +590,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:0.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:0.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -673,12 +607,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:0.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -720,7 +648,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:0.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:0.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -736,12 +664,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:0.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -777,7 +699,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:0.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:0.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -789,12 +711,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:0.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -812,12 +728,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:0.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -831,12 +741,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:0.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipe_modules/checkout/tests/git.expected/other.json b/recipe_modules/checkout/tests/git.expected/other.json
index b986fc8..25d8b4f 100644
--- a/recipe_modules/checkout/tests/git.expected/other.json
+++ b/recipe_modules/checkout/tests/git.expected/other.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipe_modules/checkout/tests/git.expected/trigger.json b/recipe_modules/checkout/tests/git.expected/trigger.json
index 8eee616..56ea780 100644
--- a/recipe_modules/checkout/tests/git.expected/trigger.json
+++ b/recipe_modules/checkout/tests/git.expected/trigger.json
@@ -435,7 +435,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -454,10 +454,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -531,7 +527,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -550,10 +546,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -638,7 +630,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -659,7 +651,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -685,10 +677,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -717,10 +705,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -748,10 +732,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -783,10 +763,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -814,10 +790,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -844,10 +816,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -876,10 +844,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -913,10 +877,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -948,10 +908,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1005,7 +961,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1023,10 +979,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1103,7 +1055,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1120,10 +1072,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1194,7 +1142,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1207,10 +1155,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1240,10 +1184,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1269,10 +1209,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 16c6d11..18186c6 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -596,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -615,10 +615,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -692,7 +688,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -711,10 +707,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -799,7 +791,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -820,7 +812,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -846,10 +838,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -878,10 +866,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -909,10 +893,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -944,10 +924,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +951,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1005,10 +977,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1037,10 +1005,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1074,10 +1038,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1109,10 +1069,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1166,7 +1122,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1184,10 +1140,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1264,7 +1216,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1281,10 +1233,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1384,7 +1332,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1397,10 +1345,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1430,10 +1374,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1459,10 +1399,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/ci.json b/recipe_modules/checkout/tests/repo.expected/ci.json
index 298334d..49b3e4a 100644
--- a/recipe_modules/checkout/tests/repo.expected/ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/ci.json
@@ -265,7 +265,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -282,12 +282,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -329,7 +323,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -345,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -386,7 +374,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -398,12 +386,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -421,12 +403,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -440,12 +416,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
index 5ac2631..09da255 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_ci.json
@@ -688,7 +688,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,10 +706,6 @@
     "cwd": "[START_DIR]/co/pinned",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -786,7 +782,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -803,10 +799,6 @@
     "cwd": "[START_DIR]/co/pinned",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -877,7 +869,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -890,10 +882,6 @@
     ],
     "cwd": "[START_DIR]/co/pinned",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -923,10 +911,6 @@
     ],
     "cwd": "[START_DIR]/co/pinned",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -952,10 +936,6 @@
     ],
     "cwd": "[START_DIR]/co/pinned",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
index 93467bd..b6cd69b 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
@@ -900,7 +900,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -918,10 +918,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -998,7 +994,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1015,10 +1011,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1142,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1147,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1188,10 +1176,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1217,10 +1201,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
index 390f435..dc26798 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
@@ -1011,7 +1011,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1029,10 +1029,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1109,7 +1105,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1126,10 +1122,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1253,7 +1245,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1266,10 +1258,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1299,10 +1287,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1328,10 +1312,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1369,7 +1349,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1387,10 +1367,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1467,7 +1443,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1484,10 +1460,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1611,7 +1583,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1624,10 +1596,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1657,10 +1625,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1686,10 +1650,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
index d622b58..9a6366d 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
@@ -920,7 +920,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -938,10 +938,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1018,7 +1014,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1035,10 +1031,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1162,7 +1154,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1175,10 +1167,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1208,10 +1196,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1237,10 +1221,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1278,7 +1258,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,10 +1276,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1376,7 +1352,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1393,10 +1369,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1520,7 +1492,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1533,10 +1505,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1566,10 +1534,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1595,10 +1559,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/no_trigger.json b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
index 1c6e700..ac72412 100644
--- a/recipe_modules/checkout/tests/repo.expected/no_trigger.json
+++ b/recipe_modules/checkout/tests/repo.expected/no_trigger.json
@@ -265,7 +265,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -282,12 +282,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -329,7 +323,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -345,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -386,7 +374,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -398,12 +386,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -421,12 +403,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -440,12 +416,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipe_modules/checkout/tests/repo.expected/prefix.json b/recipe_modules/checkout/tests/repo.expected/prefix.json
index 308a6ca..b02ad82 100644
--- a/recipe_modules/checkout/tests/repo.expected/prefix.json
+++ b/recipe_modules/checkout/tests/repo.expected/prefix.json
@@ -847,7 +847,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply foo:123456.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply foo:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -865,10 +865,6 @@
     "cwd": "[START_DIR]/co/prefix/suffix",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,7 +941,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply foo:123456.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply foo:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -962,10 +958,6 @@
     "cwd": "[START_DIR]/co/prefix/suffix",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1089,7 +1081,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply foo:123456.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply foo:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1102,10 +1094,6 @@
     ],
     "cwd": "[START_DIR]/co/prefix/suffix",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1135,10 +1123,6 @@
     ],
     "cwd": "[START_DIR]/co/prefix/suffix",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1164,10 +1148,6 @@
     ],
     "cwd": "[START_DIR]/co/prefix/suffix",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
index 345c49f..f682c50 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
@@ -1093,7 +1093,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1111,10 +1111,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1191,7 +1187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1208,10 +1204,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1335,7 +1327,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1348,10 +1340,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1381,10 +1369,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1410,10 +1394,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1451,7 +1431,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1469,10 +1449,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1549,7 +1525,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1566,10 +1542,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1693,7 +1665,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1706,10 +1678,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1739,10 +1707,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1768,10 +1732,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
index dba18e9..8931d06 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
@@ -994,7 +994,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1012,10 +1012,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1092,7 +1088,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1109,10 +1105,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1236,7 +1228,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1249,10 +1241,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1282,10 +1270,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1311,10 +1295,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1352,7 +1332,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1370,10 +1350,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1450,7 +1426,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1467,10 +1443,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1594,7 +1566,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1607,10 +1579,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1640,10 +1608,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1669,10 +1633,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple.json b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
index e09103d..95dc5d2 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
@@ -920,7 +920,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -938,10 +938,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1018,7 +1014,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1035,10 +1031,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1162,7 +1154,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1175,10 +1167,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1208,10 +1196,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1237,10 +1221,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1278,7 +1258,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,10 +1276,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1376,7 +1352,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1393,10 +1369,6 @@
     "cwd": "[START_DIR]/co/default_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1520,7 +1492,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply default:2345.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply default:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1533,10 +1505,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1566,10 +1534,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1595,10 +1559,6 @@
     ],
     "cwd": "[START_DIR]/co/default_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/try.json b/recipe_modules/checkout/tests/repo.expected/try.json
index 256a6a3..b30bba5 100644
--- a/recipe_modules/checkout/tests/repo.expected/try.json
+++ b/recipe_modules/checkout/tests/repo.expected/try.json
@@ -849,7 +849,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -867,10 +867,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -947,7 +943,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -964,10 +960,6 @@
     "cwd": "[START_DIR]/co/pigweed_path",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1091,7 +1083,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1104,10 +1096,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1137,10 +1125,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1166,10 +1150,6 @@
     ],
     "cwd": "[START_DIR]/co/pigweed_path",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/repo.expected/try_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
index 011c9aa..a8c461e 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
@@ -617,7 +617,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -635,10 +635,6 @@
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -715,7 +711,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -732,10 +728,6 @@
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -859,7 +851,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -872,10 +864,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -905,10 +893,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -934,10 +918,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
index aa4060c..7cede84 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-ci.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -452,7 +448,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -470,10 +466,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -558,7 +550,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -579,7 +571,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -605,10 +597,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -637,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -668,10 +652,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -702,10 +682,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -733,10 +709,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -763,10 +735,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -795,10 +763,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -936,7 +900,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 34s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -953,10 +917,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -986,7 +946,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1004,10 +964,6 @@
     "cwd": "[START_DIR]/co/b/c/d",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1084,7 +1040,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1101,10 +1057,6 @@
     "cwd": "[START_DIR]/co/b/c/d",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1175,7 +1127,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 29s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1188,10 +1140,6 @@
     ],
     "cwd": "[START_DIR]/co/b/c/d",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1221,10 +1169,6 @@
     ],
     "cwd": "[START_DIR]/co/b/c/d",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1250,10 +1194,6 @@
     ],
     "cwd": "[START_DIR]/co/b/c/d",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
index 529a8ce..048e073 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -664,7 +660,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -682,10 +678,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -770,7 +762,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -791,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -817,10 +809,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -849,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -880,10 +864,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -914,10 +894,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,10 +921,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +947,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1007,10 +975,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1116,7 +1080,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 34s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1133,10 +1097,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1166,7 +1126,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply x:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1184,10 +1144,6 @@
     "cwd": "[START_DIR]/co/foo1",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1264,7 +1220,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply x:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1281,10 +1237,6 @@
     "cwd": "[START_DIR]/co/foo1",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1408,7 +1360,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:123456.timeout 11h 4m 29s",
+    "name": "checkout pigweed.apply x:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1421,10 +1373,6 @@
     ],
     "cwd": "[START_DIR]/co/foo1",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1454,10 +1402,6 @@
     ],
     "cwd": "[START_DIR]/co/foo1",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1483,10 +1427,6 @@
     ],
     "cwd": "[START_DIR]/co/foo1",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
index 5ea150a..60d3947 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -664,7 +660,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -682,10 +678,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -770,7 +762,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -791,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -817,10 +809,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -849,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -880,10 +864,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -914,10 +894,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,10 +921,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +947,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1007,10 +975,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
index e7eabb4..3a0f504 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -664,7 +660,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -682,10 +678,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -770,7 +762,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -791,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -817,10 +809,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -849,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -880,10 +864,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -914,10 +894,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,10 +921,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +947,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1007,10 +975,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index ce65293..9237da2 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -664,7 +660,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -682,10 +678,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -770,7 +762,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -791,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -817,10 +809,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -849,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -880,10 +864,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -914,10 +894,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,10 +921,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +947,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1007,10 +975,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1148,7 +1112,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 34s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1165,10 +1129,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1198,7 +1158,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply z:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply z:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1216,10 +1176,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1296,7 +1252,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply z:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply z:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1313,10 +1269,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1440,7 +1392,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply z:123456.timeout 11h 4m 29s",
+    "name": "checkout pigweed.apply z:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1453,10 +1405,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1486,10 +1434,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1515,10 +1459,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
index 685a3db..572c3c1 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded-missing.json
@@ -384,7 +384,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -403,10 +403,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
index ad4fee2..dd92ea6 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-excluded.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -519,7 +515,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -539,10 +535,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -562,7 +554,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 35s",
+    "name": "checkout pigweed.cache.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -580,10 +572,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -668,7 +656,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 34s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -689,7 +677,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000016.0
       },
       "realm": {
         "name": "project:ci"
@@ -715,10 +703,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -747,10 +731,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -778,10 +758,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -812,10 +788,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -843,10 +815,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -873,10 +841,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -905,10 +869,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -962,7 +922,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -980,10 +940,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1060,7 +1016,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1077,10 +1033,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1151,7 +1103,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 29s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1164,10 +1116,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1197,10 +1145,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1226,10 +1170,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
index 2a276d3..6e133f0 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included-excluded.json
@@ -384,7 +384,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -403,10 +403,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
index e1af0c5..922f655 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-included.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -486,7 +482,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -506,10 +502,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -529,7 +521,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 35s",
+    "name": "checkout pigweed.cache.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -547,10 +539,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -635,7 +623,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 34s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -656,7 +644,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000016.0
       },
       "realm": {
         "name": "project:ci"
@@ -682,10 +670,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -714,10 +698,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -745,10 +725,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -779,10 +755,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -810,10 +782,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -840,10 +808,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -872,10 +836,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -929,7 +889,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -947,10 +907,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1027,7 +983,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1044,10 +1000,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1118,7 +1070,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 29s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1131,10 +1083,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1164,10 +1112,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1193,10 +1137,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index 34e1be5..2cb90ac 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -1087,7 +1087,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1106,10 +1106,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1156,7 +1152,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1174,10 +1170,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1262,7 +1254,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1283,7 +1275,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -1309,10 +1301,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1341,10 +1329,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1372,10 +1356,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1406,10 +1386,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1437,10 +1413,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1467,10 +1439,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1499,10 +1467,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1556,7 +1520,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1574,10 +1538,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1654,7 +1614,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1671,10 +1631,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1798,7 +1754,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1811,10 +1767,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1844,10 +1796,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1873,10 +1821,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1989,7 +1933,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 29s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2006,10 +1950,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2039,7 +1979,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 28s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2057,10 +1997,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2137,7 +2073,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 26s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2154,10 +2090,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2281,7 +2213,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 25s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2294,10 +2226,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2327,10 +2255,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2356,10 +2280,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2379,7 +2299,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 23s",
+    "name": "checkout pigweed.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2396,10 +2316,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2429,7 +2345,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:2345.timeout 11h 4m 22s",
+    "name": "checkout pigweed.apply x:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2447,10 +2363,6 @@
     "cwd": "[START_DIR]/co/bar",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2527,7 +2439,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:2345.timeout 11h 4m 20s",
+    "name": "checkout pigweed.apply x:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2544,10 +2456,6 @@
     "cwd": "[START_DIR]/co/bar",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2671,7 +2579,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:2345.timeout 11h 4m 19s",
+    "name": "checkout pigweed.apply x:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2684,10 +2592,6 @@
     ],
     "cwd": "[START_DIR]/co/bar",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2717,10 +2621,6 @@
     ],
     "cwd": "[START_DIR]/co/bar",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2746,10 +2646,6 @@
     ],
     "cwd": "[START_DIR]/co/bar",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index aab32bf..f3f0c94 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -1186,7 +1186,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1205,10 +1205,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1255,7 +1251,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1273,10 +1269,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1361,7 +1353,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1382,7 +1374,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -1408,10 +1400,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1440,10 +1428,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1471,10 +1455,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1505,10 +1485,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1536,10 +1512,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1566,10 +1538,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1598,10 +1566,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1655,7 +1619,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1673,10 +1637,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1753,7 +1713,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1770,10 +1730,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1897,7 +1853,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1910,10 +1866,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1943,10 +1895,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1972,10 +1920,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2088,7 +2032,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 29s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2105,10 +2049,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2138,7 +2078,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 28s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2156,10 +2096,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2236,7 +2172,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 26s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2253,10 +2189,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2380,7 +2312,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 25s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2393,10 +2325,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2426,10 +2354,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2455,10 +2379,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index 59ff09a..28aa963 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -742,7 +742,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -761,10 +761,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -811,7 +807,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -829,10 +825,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -917,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -938,7 +930,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -964,10 +956,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -996,10 +984,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1027,10 +1011,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1061,10 +1041,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1092,10 +1068,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1122,10 +1094,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1154,10 +1122,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1211,7 +1175,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1229,10 +1193,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1309,7 +1269,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1326,10 +1286,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1453,7 +1409,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1466,10 +1422,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1499,10 +1451,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1528,10 +1476,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1644,7 +1588,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 29s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1661,10 +1605,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1694,7 +1634,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 28s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1712,10 +1652,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1792,7 +1728,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 26s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1809,10 +1745,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1936,7 +1868,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 25s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1949,10 +1881,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1982,10 +1910,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2011,10 +1935,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index b9dc6fb..31bda07 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -741,7 +741,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -760,10 +760,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -810,7 +806,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -828,10 +824,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -916,7 +908,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -937,7 +929,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -963,10 +955,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -995,10 +983,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1026,10 +1010,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1060,10 +1040,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1091,10 +1067,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1121,10 +1093,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1153,10 +1121,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1210,7 +1174,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1228,10 +1192,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1308,7 +1268,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1325,10 +1285,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1452,7 +1408,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:3456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:3456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1465,10 +1421,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1498,10 +1450,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1527,10 +1475,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1643,7 +1587,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 29s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1660,10 +1604,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1693,7 +1633,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 28s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1711,10 +1651,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1791,7 +1727,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 26s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1808,10 +1744,6 @@
     "cwd": "[START_DIR]/co/foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1935,7 +1867,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:1234.timeout 11h 4m 25s",
+    "name": "checkout pigweed.apply x:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1948,10 +1880,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1981,10 +1909,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2010,10 +1934,6 @@
     ],
     "cwd": "[START_DIR]/co/foo",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2033,7 +1953,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 23s",
+    "name": "checkout pigweed.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -2050,10 +1970,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2083,7 +1999,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:2345.timeout 11h 4m 22s",
+    "name": "checkout pigweed.apply x:2345.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2101,10 +2017,6 @@
     "cwd": "[START_DIR]/co/bar",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2181,7 +2093,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:2345.timeout 11h 4m 20s",
+    "name": "checkout pigweed.apply x:2345.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2198,10 +2110,6 @@
     "cwd": "[START_DIR]/co/bar",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2325,7 +2233,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:2345.timeout 11h 4m 19s",
+    "name": "checkout pigweed.apply x:2345.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -2338,10 +2246,6 @@
     ],
     "cwd": "[START_DIR]/co/bar",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2371,10 +2275,6 @@
     ],
     "cwd": "[START_DIR]/co/bar",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -2400,10 +2300,6 @@
     ],
     "cwd": "[START_DIR]/co/bar",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index 1b78868..70b1817 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -664,7 +660,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -682,10 +678,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -770,7 +762,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -791,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -817,10 +809,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -849,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -880,10 +864,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -914,10 +894,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,10 +921,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +947,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1007,10 +975,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 980e24b..8859a3f 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -664,7 +660,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -682,10 +678,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -770,7 +762,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -791,7 +783,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -817,10 +809,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -849,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -880,10 +864,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -914,10 +894,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -945,10 +921,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -975,10 +947,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1007,10 +975,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1148,7 +1112,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.timeout 11h 4m 34s",
+    "name": "checkout pigweed.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1165,10 +1129,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1198,7 +1158,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply x:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1216,10 +1176,6 @@
     "cwd": "[START_DIR]/co/baz",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1296,7 +1252,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply x:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1313,10 +1269,6 @@
     "cwd": "[START_DIR]/co/baz",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1440,7 +1392,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply x:123456.timeout 11h 4m 29s",
+    "name": "checkout pigweed.apply x:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1453,10 +1405,6 @@
     ],
     "cwd": "[START_DIR]/co/baz",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1486,10 +1434,6 @@
     ],
     "cwd": "[START_DIR]/co/baz",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1515,10 +1459,6 @@
     ],
     "cwd": "[START_DIR]/co/baz",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipe_modules/default_timeout/api.py b/recipe_modules/default_timeout/api.py
index 04296e2..662612e 100644
--- a/recipe_modules/default_timeout/api.py
+++ b/recipe_modules/default_timeout/api.py
@@ -26,30 +26,35 @@
 
     @contextlib.contextmanager
     def __call__(self, buffer_sec=120):
-        current_time = self.m.time.time()
+        current_time_sec = self.m.time.time()
 
         # Amount of time elapsed in the run.
-        elapsed_time = (
-            current_time - self.m.buildbucket.build.start_time.seconds
+        elapsed_time_sec = (
+            current_time_sec - self.m.buildbucket.build.start_time.seconds
         )
 
         # Amount of time before build times out.
-        time_remaining = (
-            self.m.buildbucket.build.execution_timeout.seconds - elapsed_time
+        time_remaining_sec = (
+            self.m.buildbucket.build.execution_timeout.seconds
+            - elapsed_time_sec
         )
 
         # Give a buffer before build times out and kill this step then. This
         # should give enough time to read any logfiles and maybe upload to
-        # logdog/GCS before the build times out.
-        timeout = time_remaining - buffer_sec
+        # GCS before the build times out.
+        timeout_sec = time_remaining_sec - buffer_sec
 
-        soft_deadline = current_time + timeout
+        # Most tests don't appropriately set up timing, and this could be
+        # invoked at the very end of a build where it's about to timeout, so
+        # make sure the timeout is always at least 10 seconds in the future.
+        if timeout_sec < 10:
+            timeout_sec = 10
 
-        with self.m.step.nest(f'timeout {nice_duration(timeout)}'):
+        with self.m.step.nest(f'timeout {nice_duration(timeout_sec)}'):
             pass
 
         deadline = sections_pb2.Deadline()
-        deadline.soft_deadline = soft_deadline
+        deadline.soft_deadline = current_time_sec + timeout_sec
         deadline.grace_period = 30.0
 
         try:
diff --git a/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json b/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json
new file mode 100644
index 0000000..ef1c4fe
--- /dev/null
+++ b/recipe_modules/default_timeout/tests/full.expected/no-special-timing.json
@@ -0,0 +1,37 @@
+[
+  {
+    "cmd": [],
+    "name": "timeout 10s"
+  },
+  {
+    "cmd": [
+      "step1"
+    ],
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337000011.5
+      }
+    },
+    "name": "step1"
+  },
+  {
+    "cmd": [],
+    "name": "timeout 10s (2)"
+  },
+  {
+    "cmd": [
+      "step2"
+    ],
+    "luci_context": {
+      "deadline": {
+        "grace_period": 30.0,
+        "soft_deadline": 1337000013.0
+      }
+    },
+    "name": "step2"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file
diff --git a/recipe_modules/default_timeout/tests/full.py b/recipe_modules/default_timeout/tests/full.py
index 091b721..033ab6a 100644
--- a/recipe_modules/default_timeout/tests/full.py
+++ b/recipe_modules/default_timeout/tests/full.py
@@ -47,3 +47,5 @@
         + api.time.seed(1600000000)
         + api.time.step(20.0)
     )
+
+    yield api.test('no-special-timing')
diff --git a/recipe_modules/environment/tests/full.expected/doctor-fail.json b/recipe_modules/environment/tests/full.expected/doctor-fail.json
index 45aa073..2dacf72 100644
--- a/recipe_modules/environment/tests/full.expected/doctor-fail.json
+++ b/recipe_modules/environment/tests/full.expected/doctor-fail.json
@@ -80,7 +80,7 @@
   },
   {
     "cmd": [],
-    "name": "environment.run pw_env_setup.timeout 11h 4m 38s",
+    "name": "environment.run pw_env_setup.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/normal.json b/recipe_modules/environment/tests/full.expected/normal.json
index b25f7d1..2eee593 100644
--- a/recipe_modules/environment/tests/full.expected/normal.json
+++ b/recipe_modules/environment/tests/full.expected/normal.json
@@ -279,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "environment.run pw_env_setup.timeout 11h 4m 38s",
+    "name": "environment.run pw_env_setup.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -327,7 +327,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/override-cas.json b/recipe_modules/environment/tests/full.expected/override-cas.json
index 96d7ef3..a22e023 100644
--- a/recipe_modules/environment/tests/full.expected/override-cas.json
+++ b/recipe_modules/environment/tests/full.expected/override-cas.json
@@ -80,7 +80,7 @@
   },
   {
     "cmd": [],
-    "name": "environment.run pw_env_setup.timeout 11h 4m 38s",
+    "name": "environment.run pw_env_setup.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/override-cipd.json b/recipe_modules/environment/tests/full.expected/override-cipd.json
index a336a6d..7bcdaeb 100644
--- a/recipe_modules/environment/tests/full.expected/override-cipd.json
+++ b/recipe_modules/environment/tests/full.expected/override-cipd.json
@@ -80,7 +80,7 @@
   },
   {
     "cmd": [],
-    "name": "environment.run pw_env_setup.timeout 11h 4m 38s",
+    "name": "environment.run pw_env_setup.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index a521ef3..fbb019b 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -80,7 +80,7 @@
   },
   {
     "cmd": [],
-    "name": "environment.run pw_env_setup.timeout 11h 4m 38s",
+    "name": "environment.run pw_env_setup.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -128,7 +128,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000011.5
       }
     },
     "name": "environment.run pw_env_setup.pw_env_setup",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
index 1d447f0..adb6874 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/bad-json-steps.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 37s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -44,7 +44,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000013.0
       },
       "realm": {
         "name": "project:ci"
@@ -66,7 +66,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 35s",
+    "name": "get steps from programs.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -103,7 +103,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -131,7 +131,7 @@
   },
   {
     "cmd": [],
-    "name": "program_0.timeout 11h 4m 34s",
+    "name": "program_0.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -168,7 +168,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000016.0
       },
       "realm": {
         "name": "project:ci"
@@ -1220,7 +1220,7 @@
   },
   {
     "cmd": [],
-    "name": "program_1.timeout 11h 4m 32s",
+    "name": "program_1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1257,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000017.5
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
index 5f3636b..afd290f 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-disallowed-host.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 23h 59m 20s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000050.0
       },
       "realm": {
         "name": "project:try"
@@ -120,7 +120,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 23h 59m",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -1219,7 +1219,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 23h 58m 40s",
+    "name": "step2.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1258,7 +1258,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000090.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
index c944688..9c44a58 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always-no-cl.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 30m 40s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1600000050.0
       },
       "realm": {
         "name": "project:ci"
@@ -120,7 +120,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 11h 30m 20s",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:ci"
@@ -1219,7 +1219,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 11h 30m",
+    "name": "step2.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1258,7 +1258,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1600000090.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
index be22c2a..a0f40da 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-always.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 23h 59m 20s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000050.0
       },
       "realm": {
         "name": "project:try"
@@ -120,7 +120,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 23h 59m",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -1382,7 +1382,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 23h 58m 40s",
+    "name": "step2.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1421,7 +1421,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000090.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
index 48793a5..a7df825 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/comment-on-failure.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 23h 59m 20s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -46,7 +46,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000050.0
       },
       "realm": {
         "name": "project:try"
@@ -120,7 +120,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 23h 59m",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -159,7 +159,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -1219,7 +1219,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 23h 58m 40s",
+    "name": "step2.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1258,7 +1258,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000090.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json b/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json
index 362cb1e..82f45fa 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/empty-program.json
@@ -5,7 +5,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 37s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -30,7 +30,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "get steps from programs.get steps",
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
index 177ccf1..66fc75f 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/pigweed.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 37s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -44,7 +44,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000013.0
       },
       "realm": {
         "name": "project:ci"
@@ -118,7 +118,7 @@
   },
   {
     "cmd": [],
-    "name": "full_0.timeout 11h 4m 35s",
+    "name": "full_0.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -157,7 +157,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -1209,7 +1209,7 @@
   },
   {
     "cmd": [],
-    "name": "full_1.timeout 11h 4m 34s",
+    "name": "full_1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1248,7 +1248,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000016.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/step.json b/recipe_modules/pw_presubmit/tests/full.expected/step.json
index 43b72a6..70a5c92 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/step.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/step.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 23h 59m 20s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -48,7 +48,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000050.0
       },
       "realm": {
         "name": "project:try"
@@ -122,7 +122,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 23h 59m",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -167,7 +167,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -1219,7 +1219,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 23h 58m 40s",
+    "name": "step2.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1264,7 +1264,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000090.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/substep.json b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
index f071dcd..62a065b 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/substep.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
@@ -8,7 +8,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 37s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -33,7 +33,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000013.0
       }
     },
     "name": "get steps from programs.get steps",
@@ -81,7 +81,7 @@
   },
   {
     "cmd": [],
-    "name": "composite.timeout 11h 4m 35s",
+    "name": "composite.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -111,7 +111,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "composite.substep1",
@@ -122,7 +122,7 @@
   },
   {
     "cmd": [],
-    "name": "composite.timeout 11h 4m 34s",
+    "name": "composite.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -153,7 +153,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000016.0
       }
     },
     "name": "composite.substep2",
diff --git a/recipes/build.expected/basic.json b/recipes/build.expected/basic.json
index 3f5a744..e5f706b 100644
--- a/recipes/build.expected/basic.json
+++ b/recipes/build.expected/basic.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1521,7 +1457,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 29s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -1535,7 +1471,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000020.5
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/build.expected/skip_archive.json b/recipes/build.expected/skip_archive.json
index 86c38f2..760f09d 100644
--- a/recipes/build.expected/skip_archive.json
+++ b/recipes/build.expected/skip_archive.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1521,7 +1457,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 29s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -1535,7 +1471,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000020.5
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/cipd_roller.expected/bad_package_spec.json b/recipes/cipd_roller.expected/bad_package_spec.json
index 3a3179f..58ab684 100644
--- a/recipes/cipd_roller.expected/bad_package_spec.json
+++ b/recipes/cipd_roller.expected/bad_package_spec.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/missing_tag.json b/recipes/cipd_roller.expected/missing_tag.json
index 5a81ece..3d34aac 100644
--- a/recipes/cipd_roller.expected/missing_tag.json
+++ b/recipes/cipd_roller.expected/missing_tag.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/multiple_common_tags.json b/recipes/cipd_roller.expected/multiple_common_tags.json
index 82c27a4..ec2fa85 100644
--- a/recipes/cipd_roller.expected/multiple_common_tags.json
+++ b/recipes/cipd_roller.expected/multiple_common_tags.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/no_common_tags.json b/recipes/cipd_roller.expected/no_common_tags.json
index 106c058..71b6b1b 100644
--- a/recipes/cipd_roller.expected/no_common_tags.json
+++ b/recipes/cipd_roller.expected/no_common_tags.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
index a1c0c00..06057c5 100644
--- a/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
+++ b/recipes/cipd_roller.expected/no_common_tags_and_relaxing_ref_mismatch_does_not_help.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
index b808138..57546cb 100644
--- a/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
+++ b/recipes/cipd_roller.expected/no_common_tags_but_relaxing_ref_mismatch_helps.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/no_curlies_in_spec.json b/recipes/cipd_roller.expected/no_curlies_in_spec.json
index 9aff087..1969706 100644
--- a/recipes/cipd_roller.expected/no_curlies_in_spec.json
+++ b/recipes/cipd_roller.expected/no_curlies_in_spec.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/platform-independent.json b/recipes/cipd_roller.expected/platform-independent.json
index c9353e7..10fa2ee 100644
--- a/recipes/cipd_roller.expected/platform-independent.json
+++ b/recipes/cipd_roller.expected/platform-independent.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/cipd_roller.expected/success.json b/recipes/cipd_roller.expected/success.json
index 0704eb4..6cdd2c1 100644
--- a/recipes/cipd_roller.expected/success.json
+++ b/recipes/cipd_roller.expected/success.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/docs_builder.expected/docs-dry_run-build.json b/recipes/docs_builder.expected/docs-dry_run-build.json
index 8d5d713..32f6973 100644
--- a/recipes/docs_builder.expected/docs-dry_run-build.json
+++ b/recipes/docs_builder.expected/docs-dry_run-build.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1023,7 +927,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 29s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -1038,7 +942,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000020.5
       }
     },
     "name": "ninja"
diff --git a/recipes/docs_builder.expected/docs-postsubmit.json b/recipes/docs_builder.expected/docs-postsubmit.json
index 1550f3a..cc31d62 100644
--- a/recipes/docs_builder.expected/docs-postsubmit.json
+++ b/recipes/docs_builder.expected/docs-postsubmit.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1017,7 +921,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 28s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1045,7 +949,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000022.0
       }
     },
     "name": "get steps from programs.get steps",
@@ -1097,7 +1001,7 @@
   },
   {
     "cmd": [],
-    "name": "step.timeout 11h 4m 26s",
+    "name": "step.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1126,7 +1030,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000023.5
       }
     },
     "name": "step.step",
diff --git a/recipes/docs_builder.expected/docs-presubmit.json b/recipes/docs_builder.expected/docs-presubmit.json
index baf90bd..40be5ac 100644
--- a/recipes/docs_builder.expected/docs-presubmit.json
+++ b/recipes/docs_builder.expected/docs-presubmit.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -691,7 +687,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -710,10 +706,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -798,7 +790,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -819,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -845,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -877,10 +865,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -908,10 +892,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -943,10 +923,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -974,10 +950,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1004,10 +976,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1036,10 +1004,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1073,10 +1037,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1108,10 +1068,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1165,7 +1121,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1183,10 +1139,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1263,7 +1215,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1280,10 +1232,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1407,7 +1355,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1420,10 +1368,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1453,10 +1397,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1482,10 +1422,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1767,7 +1703,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 28s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1806,7 +1742,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000022.0
       },
       "realm": {
         "name": "project:try"
@@ -1880,7 +1816,7 @@
   },
   {
     "cmd": [],
-    "name": "step.timeout 11h 4m 26s",
+    "name": "step.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1920,7 +1856,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000023.5
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/envtest.expected/environment_variables.json b/recipes/envtest.expected/environment_variables.json
index 1180bf4..6861d3d 100644
--- a/recipes/envtest.expected/environment_variables.json
+++ b/recipes/envtest.expected/environment_variables.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index 062f64d..40781f4 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/envtest.expected/pigweed.json b/recipes/envtest.expected/pigweed.json
index 0c62a84..815ed65 100644
--- a/recipes/envtest.expected/pigweed.json
+++ b/recipes/envtest.expected/pigweed.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/envtest.expected/windows.json b/recipes/envtest.expected/windows.json
index 90695ea..f6ba0a6 100644
--- a/recipes/envtest.expected/windows.json
+++ b/recipes/envtest.expected/windows.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]\\git\\pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]\\git\\pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]\\co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]\\co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]\\co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]\\co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/luci_config.expected/starlark.json b/recipes/luci_config.expected/starlark.json
index cd21060..355f2b2 100644
--- a/recipes/luci_config.expected/starlark.json
+++ b/recipes/luci_config.expected/starlark.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -691,7 +687,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -710,10 +706,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -798,7 +790,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -819,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -845,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -877,10 +865,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -908,10 +892,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -943,10 +923,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -974,10 +950,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1004,10 +976,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1036,10 +1004,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1073,10 +1037,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1108,10 +1068,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1165,7 +1121,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1183,10 +1139,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1263,7 +1215,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1280,10 +1232,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1407,7 +1355,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1420,10 +1368,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1453,10 +1397,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1482,10 +1422,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipes/pw_presubmit.expected/one_step.json b/recipes/pw_presubmit.expected/one_step.json
index 696b3a0..4a25374 100644
--- a/recipes/pw_presubmit.expected/one_step.json
+++ b/recipes/pw_presubmit.expected/one_step.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -691,7 +687,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -710,10 +706,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -798,7 +790,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -819,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -845,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -877,10 +865,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -908,10 +892,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -943,10 +923,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -974,10 +950,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1004,10 +976,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1036,10 +1004,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1073,10 +1037,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1108,10 +1068,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1165,7 +1121,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1183,10 +1139,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1263,7 +1215,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1280,10 +1232,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1407,7 +1355,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1420,10 +1368,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1453,10 +1397,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1482,10 +1422,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1767,7 +1703,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 28s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1806,7 +1742,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000022.0
       },
       "realm": {
         "name": "project:try"
@@ -1880,7 +1816,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 11h 4m 26s",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1920,7 +1856,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000023.5
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/pw_presubmit.expected/sign.json b/recipes/pw_presubmit.expected/sign.json
index 01ff6e0..b55c722 100644
--- a/recipes/pw_presubmit.expected/sign.json
+++ b/recipes/pw_presubmit.expected/sign.json
@@ -383,7 +383,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -402,10 +402,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -479,7 +475,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -498,10 +494,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -586,7 +578,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -607,7 +599,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -633,10 +625,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +653,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -696,10 +680,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -731,10 +711,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -762,10 +738,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -792,10 +764,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -824,10 +792,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -861,10 +825,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -896,10 +856,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -953,7 +909,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -971,10 +927,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1051,7 +1003,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1068,10 +1020,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1142,7 +1090,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1155,10 +1103,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1188,10 +1132,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1217,10 +1157,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1502,7 +1438,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 28s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1541,7 +1477,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000022.0
       },
       "realm": {
         "name": "project:ci"
@@ -1615,7 +1551,7 @@
   },
   {
     "cmd": [],
-    "name": "release.timeout 11h 4m 26s",
+    "name": "release.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1655,7 +1591,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000023.5
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/pw_presubmit.expected/two_steps.json b/recipes/pw_presubmit.expected/two_steps.json
index 258558f..5e85f85 100644
--- a/recipes/pw_presubmit.expected/two_steps.json
+++ b/recipes/pw_presubmit.expected/two_steps.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 23h 59m 40s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -687,7 +687,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 23h 59m 20s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -790,7 +790,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 23h 59m",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -811,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000070.0
       },
       "realm": {
         "name": "project:try"
@@ -1121,7 +1121,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 23h 58m 40s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1215,7 +1215,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 23h 58m 20s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1355,7 +1355,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 23h 58m",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1703,7 +1703,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 23h 57m 20s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1744,7 +1744,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000170.0
       },
       "realm": {
         "name": "project:try"
@@ -1821,7 +1821,7 @@
   },
   {
     "cmd": [],
-    "name": "step1.timeout 23h 57m",
+    "name": "step1.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1862,7 +1862,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000190.0
       },
       "realm": {
         "name": "project:try"
@@ -3004,7 +3004,7 @@
   },
   {
     "cmd": [],
-    "name": "step2.timeout 23h 56m 40s",
+    "name": "step2.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -3045,7 +3045,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": 1600000000.0
+        "soft_deadline": 1600000210.0
       },
       "realm": {
         "name": "project:try"
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index 5c11f8e..bddf46d 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -691,7 +687,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -710,10 +706,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -798,7 +790,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -819,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -845,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -877,10 +865,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -908,10 +892,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -943,10 +923,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -974,10 +950,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1004,10 +976,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1036,10 +1004,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1073,10 +1037,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1108,10 +1068,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1165,7 +1121,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1183,10 +1139,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1263,7 +1215,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1280,10 +1232,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1407,7 +1355,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1420,10 +1368,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1453,10 +1397,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1482,10 +1422,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipes/repo_roller.expected/backwards.json b/recipes/repo_roller.expected/backwards.json
index 44e46c0..3b7aae3 100644
--- a/recipes/repo_roller.expected/backwards.json
+++ b/recipes/repo_roller.expected/backwards.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.cache.timeout 11h 4m 34s",
+    "name": "checkout a.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/foo.googlesource.com-a",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.cache.timeout 11h 4m 32s",
+    "name": "checkout a.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/foo.googlesource.com-a",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.git checkout.timeout 11h 4m 31s",
+    "name": "checkout a.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/dotdot-prefix.json b/recipes/repo_roller.expected/dotdot-prefix.json
index 9093e73..4a99800 100644
--- a/recipes/repo_roller.expected/dotdot-prefix.json
+++ b/recipes/repo_roller.expected/dotdot-prefix.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout g.cache.timeout 11h 4m 34s",
+    "name": "checkout g.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-prefix-g",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout g.cache.timeout 11h 4m 32s",
+    "name": "checkout g.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-prefix-g",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout g.git checkout.timeout 11h 4m 31s",
+    "name": "checkout g.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/equivalent.json b/recipes/repo_roller.expected/equivalent.json
index ede7921..1f28bc4 100644
--- a/recipes/repo_roller.expected/equivalent.json
+++ b/recipes/repo_roller.expected/equivalent.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout b.cache.timeout 11h 4m 34s",
+    "name": "checkout b.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/bar.googlesource.com-b",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout b.cache.timeout 11h 4m 32s",
+    "name": "checkout b.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/bar.googlesource.com-b",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout b.git checkout.timeout 11h 4m 31s",
+    "name": "checkout b.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/host-dot-dot.json b/recipes/repo_roller.expected/host-dot-dot.json
index 38bdcae..2ae0677 100644
--- a/recipes/repo_roller.expected/host-dot-dot.json
+++ b/recipes/repo_roller.expected/host-dot-dot.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout f.cache.timeout 11h 4m 34s",
+    "name": "checkout f.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-f",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout f.cache.timeout 11h 4m 32s",
+    "name": "checkout f.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-f",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout f.git checkout.timeout 11h 4m 31s",
+    "name": "checkout f.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/host-prefix.json b/recipes/repo_roller.expected/host-prefix.json
index 3dd94e9..0a33c53 100644
--- a/recipes/repo_roller.expected/host-prefix.json
+++ b/recipes/repo_roller.expected/host-prefix.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout h.cache.timeout 11h 4m 34s",
+    "name": "checkout h.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-prefix-h",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout h.cache.timeout 11h 4m 32s",
+    "name": "checkout h.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-prefix-h",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout h.git checkout.timeout 11h 4m 31s",
+    "name": "checkout h.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/name-not-found.json b/recipes/repo_roller.expected/name-not-found.json
index 12e6bae..164cbc5 100644
--- a/recipes/repo_roller.expected/name-not-found.json
+++ b/recipes/repo_roller.expected/name-not-found.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
index 40b0f91..f9a1d08 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-branch.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -729,7 +663,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout c.cache.timeout 11h 4m 34s",
+    "name": "checkout c.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -747,12 +681,6 @@
     ],
     "cwd": "[CACHE]/git/bar.googlesource.com-c",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -776,7 +704,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout c.cache.timeout 11h 4m 32s",
+    "name": "checkout c.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -793,12 +721,6 @@
     ],
     "cwd": "[CACHE]/git/bar.googlesource.com-c",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -848,7 +770,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout c.git checkout.timeout 11h 4m 31s",
+    "name": "checkout c.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -869,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout c.git checkout.makedirs",
@@ -884,12 +806,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -906,12 +822,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -927,12 +837,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -951,12 +855,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -972,12 +870,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -992,12 +884,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1014,12 +900,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout c.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
index ee6dc98..dcf7b26 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-hash.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -729,7 +663,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout d.cache.timeout 11h 4m 34s",
+    "name": "checkout d.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -747,12 +681,6 @@
     ],
     "cwd": "[CACHE]/git/bar.googlesource.com-d",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -776,7 +704,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout d.cache.timeout 11h 4m 32s",
+    "name": "checkout d.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -793,12 +721,6 @@
     ],
     "cwd": "[CACHE]/git/bar.googlesource.com-d",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -848,7 +770,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout d.git checkout.timeout 11h 4m 31s",
+    "name": "checkout d.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -869,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout d.git checkout.makedirs",
@@ -884,12 +806,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -906,12 +822,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -927,12 +837,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -951,12 +855,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -972,12 +870,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -992,12 +884,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1014,12 +900,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout d.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
index 6f509d9..2beb084 100644
--- a/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
+++ b/recipes/repo_roller.expected/no-trigger-with-revision-tag.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -729,7 +663,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout e5.cache.timeout 11h 4m 34s",
+    "name": "checkout e5.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -747,12 +681,6 @@
     ],
     "cwd": "[CACHE]/git/bar.googlesource.com-e5",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -776,7 +704,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout e5.cache.timeout 11h 4m 32s",
+    "name": "checkout e5.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -793,12 +721,6 @@
     ],
     "cwd": "[CACHE]/git/bar.googlesource.com-e5",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -848,7 +770,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout e5.git checkout.timeout 11h 4m 31s",
+    "name": "checkout e5.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -869,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout e5.git checkout.makedirs",
@@ -884,12 +806,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -906,12 +822,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -927,12 +837,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -951,12 +855,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -972,12 +870,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -992,12 +884,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1014,12 +900,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout e5.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/repo_roller.expected/no-trigger-with-upstream.json b/recipes/repo_roller.expected/no-trigger-with-upstream.json
index eba169d..5bce182 100644
--- a/recipes/repo_roller.expected/no-trigger-with-upstream.json
+++ b/recipes/repo_roller.expected/no-trigger-with-upstream.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout manifest.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout manifest.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -729,7 +663,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.cache.timeout 11h 4m 34s",
+    "name": "checkout a.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -747,12 +681,6 @@
     ],
     "cwd": "[CACHE]/git/foo.googlesource.com-a",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -776,7 +704,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.cache.timeout 11h 4m 32s",
+    "name": "checkout a.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -793,12 +721,6 @@
     ],
     "cwd": "[CACHE]/git/foo.googlesource.com-a",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -848,7 +770,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.git checkout.timeout 11h 4m 31s",
+    "name": "checkout a.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -869,7 +791,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout a.git checkout.makedirs",
@@ -884,12 +806,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -906,12 +822,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -927,12 +837,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -951,12 +855,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -972,12 +870,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -992,12 +884,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1014,12 +900,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout a.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/repo_roller.expected/success.json b/recipes/repo_roller.expected/success.json
index 4084245..ca3f929 100644
--- a/recipes/repo_roller.expected/success.json
+++ b/recipes/repo_roller.expected/success.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.cache.timeout 11h 4m 34s",
+    "name": "checkout a.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/foo.googlesource.com-a",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.cache.timeout 11h 4m 32s",
+    "name": "checkout a.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/foo.googlesource.com-a",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout a.git checkout.timeout 11h 4m 31s",
+    "name": "checkout a.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
index 8f1644c..2914c70 100644
--- a/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
+++ b/recipes/repo_roller.expected/upstream-not-set-revision-not-branch.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/repo_roller.expected/upstream-not-set.json b/recipes/repo_roller.expected/upstream-not-set.json
index c34e16c..ad27550 100644
--- a/recipes/repo_roller.expected/upstream-not-set.json
+++ b/recipes/repo_roller.expected/upstream-not-set.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 38s",
+    "name": "checkout manifest.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.cache.timeout 11h 4m 37s",
+    "name": "checkout manifest.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/host.googlesource.com-manifest",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout manifest.git checkout.timeout 11h 4m 35s",
+    "name": "checkout manifest.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1113,7 +1069,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout c.cache.timeout 11h 4m 34s",
+    "name": "checkout c.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,10 +1088,6 @@
     "cwd": "[CACHE]/git/bar.googlesource.com-c",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1182,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout c.cache.timeout 11h 4m 32s",
+    "name": "checkout c.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1200,10 +1152,6 @@
     "cwd": "[CACHE]/git/bar.googlesource.com-c",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1288,7 +1236,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout c.git checkout.timeout 11h 4m 31s",
+    "name": "checkout c.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1309,7 +1257,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1335,10 +1283,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1367,10 +1311,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1398,10 +1338,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1432,10 +1368,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1463,10 +1395,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1493,10 +1421,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1525,10 +1449,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/run_script.expected/run_script.json b/recipes/run_script.expected/run_script.json
index 027aafe..82f7179 100644
--- a/recipes/run_script.expected/run_script.json
+++ b/recipes/run_script.expected/run_script.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/run_script.expected/variable_substitution.json b/recipes/run_script.expected/variable_substitution.json
index 697c655..00c830e 100644
--- a/recipes/run_script.expected/variable_substitution.json
+++ b/recipes/run_script.expected/variable_substitution.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/submodule_roller.expected/missing.json b/recipes/submodule_roller.expected/missing.json
index b570a19..a74e545 100644
--- a/recipes/submodule_roller.expected/missing.json
+++ b/recipes/submodule_roller.expected/missing.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/submodule_roller.expected/noop.json b/recipes/submodule_roller.expected/noop.json
index 09e31ae..3d9cdc0 100644
--- a/recipes/submodule_roller.expected/noop.json
+++ b/recipes/submodule_roller.expected/noop.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/submodule_roller.expected/partial_noop.json b/recipes/submodule_roller.expected/partial_noop.json
index ac27263..bdd3cd6 100644
--- a/recipes/submodule_roller.expected/partial_noop.json
+++ b/recipes/submodule_roller.expected/partial_noop.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/submodule_roller.expected/success.json b/recipes/submodule_roller.expected/success.json
index 8414628..d1254ab 100644
--- a/recipes/submodule_roller.expected/success.json
+++ b/recipes/submodule_roller.expected/success.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/target_to_cipd.expected/pw-presubmit.json b/recipes/target_to_cipd.expected/pw-presubmit.json
index ce28171..003a7b0 100644
--- a/recipes/target_to_cipd.expected/pw-presubmit.json
+++ b/recipes/target_to_cipd.expected/pw-presubmit.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1017,7 +921,7 @@
   },
   {
     "cmd": [],
-    "name": "get steps from programs.timeout 11h 4m 28s",
+    "name": "get steps from programs.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1045,7 +949,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000022.0
       }
     },
     "name": "get steps from programs.get steps",
@@ -1097,7 +1001,7 @@
   },
   {
     "cmd": [],
-    "name": "step.timeout 11h 4m 26s",
+    "name": "step.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1126,7 +1030,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000023.5
       }
     },
     "name": "step.step",
diff --git a/recipes/target_to_cipd.expected/success.json b/recipes/target_to_cipd.expected/success.json
index 2147b42..e2cc2a2 100644
--- a/recipes/target_to_cipd.expected/success.json
+++ b/recipes/target_to_cipd.expected/success.json
@@ -352,7 +352,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 38s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -370,10 +370,6 @@
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -450,7 +446,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 37s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -467,10 +463,6 @@
     "cwd": "[START_DIR]/co/.repo/manifests",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -541,7 +533,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 35s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -554,10 +546,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -587,10 +575,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -616,10 +600,6 @@
     ],
     "cwd": "[START_DIR]/co/.repo/manifests",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1154,7 +1134,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 34s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -1170,7 +1150,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000016.0
       },
       "realm": {
         "name": "project:ci"
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index e1dfe27..b8b8e7c 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -720,7 +720,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -739,10 +739,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -816,7 +812,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -835,10 +831,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -923,7 +915,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -944,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -970,10 +962,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1002,10 +990,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1033,10 +1017,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1068,10 +1048,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1099,10 +1075,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1129,10 +1101,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1161,10 +1129,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1198,10 +1162,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1233,10 +1193,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1290,7 +1246,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1308,10 +1264,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1388,7 +1340,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1405,10 +1357,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1532,7 +1480,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1545,10 +1493,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1578,10 +1522,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1607,10 +1547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index 7af2f34..ddbedd9 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -720,7 +720,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -739,10 +739,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -816,7 +812,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -835,10 +831,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -923,7 +915,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -944,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -970,10 +962,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1002,10 +990,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1033,10 +1017,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1068,10 +1048,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1099,10 +1075,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1129,10 +1101,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1161,10 +1129,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1198,10 +1162,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1233,10 +1193,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1290,7 +1246,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1308,10 +1264,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1388,7 +1340,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1405,10 +1357,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1532,7 +1480,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1545,10 +1493,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1578,10 +1522,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1607,10 +1547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index 0d9bc57..6e48877 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -720,7 +720,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -739,10 +739,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -816,7 +812,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -835,10 +831,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -923,7 +915,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -944,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -970,10 +962,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1002,10 +990,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1033,10 +1017,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1068,10 +1048,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1099,10 +1075,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1129,10 +1101,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1161,10 +1129,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1198,10 +1162,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1233,10 +1193,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1290,7 +1246,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1308,10 +1264,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1388,7 +1340,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1405,10 +1357,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1532,7 +1480,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1545,10 +1493,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1578,10 +1522,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1607,10 +1547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index c60d65a..3f01e86 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -720,7 +720,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -739,10 +739,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -816,7 +812,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -835,10 +831,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -923,7 +915,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -944,7 +936,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -970,10 +962,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1002,10 +990,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1033,10 +1017,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1068,10 +1048,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1099,10 +1075,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1129,10 +1101,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1161,10 +1129,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1198,10 +1162,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1233,10 +1193,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1290,7 +1246,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1308,10 +1264,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1388,7 +1340,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1405,10 +1357,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1532,7 +1480,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1545,10 +1493,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1578,10 +1522,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1607,10 +1547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
diff --git a/recipes/tokendb_updater.expected/dry-run.json b/recipes/tokendb_updater.expected/dry-run.json
index 930979f..e9f2fe8 100644
--- a/recipes/tokendb_updater.expected/dry-run.json
+++ b/recipes/tokendb_updater.expected/dry-run.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1023,7 +927,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 29s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -1038,7 +942,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000020.5
       }
     },
     "name": "ninja"
diff --git a/recipes/tokendb_updater.expected/simple.json b/recipes/tokendb_updater.expected/simple.json
index c27a8ec..a780347 100644
--- a/recipes/tokendb_updater.expected/simple.json
+++ b/recipes/tokendb_updater.expected/simple.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1023,7 +927,7 @@
   },
   {
     "cmd": [],
-    "name": "timeout 11h 4m 29s"
+    "name": "timeout 10s"
   },
   {
     "cmd": [
@@ -1038,7 +942,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000020.5
       }
     },
     "name": "ninja"
diff --git a/recipes/txt_roller.expected/backwards.json b/recipes/txt_roller.expected/backwards.json
index f3a1695..037e5bc 100644
--- a/recipes/txt_roller.expected/backwards.json
+++ b/recipes/txt_roller.expected/backwards.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -842,7 +776,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.cache.timeout 11h 4m 34s",
+    "name": "checkout foo.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -860,12 +794,6 @@
     ],
     "cwd": "[CACHE]/git/foo.googlesource.com-foo",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -889,7 +817,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.cache.timeout 11h 4m 32s",
+    "name": "checkout foo.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -906,12 +834,6 @@
     ],
     "cwd": "[CACHE]/git/foo.googlesource.com-foo",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -961,7 +883,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.git checkout.timeout 11h 4m 31s",
+    "name": "checkout foo.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -982,7 +904,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout foo.git checkout.makedirs",
@@ -997,12 +919,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1019,12 +935,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1040,12 +950,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1064,12 +968,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -1085,12 +983,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1105,12 +997,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1127,12 +1013,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1163,7 +1043,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 29s",
+    "name": "checkout foo.apply foo:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1180,12 +1060,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -1227,7 +1101,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 28s",
+    "name": "checkout foo.apply foo:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1243,12 +1117,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -1284,7 +1152,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 26s",
+    "name": "checkout foo.apply foo:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,12 +1164,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/project",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1319,12 +1181,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/project",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -1338,12 +1194,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/project",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/txt_roller.expected/bad-trigger.json b/recipes/txt_roller.expected/bad-trigger.json
index f475b55..ddf3a83 100644
--- a/recipes/txt_roller.expected/bad-trigger.json
+++ b/recipes/txt_roller.expected/bad-trigger.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/txt_roller.expected/no-trigger.json b/recipes/txt_roller.expected/no-trigger.json
index dbd61ef..b4dedcf 100644
--- a/recipes/txt_roller.expected/no-trigger.json
+++ b/recipes/txt_roller.expected/no-trigger.json
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -133,12 +133,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -177,7 +171,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -195,12 +189,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -250,7 +238,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -271,7 +259,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -286,12 +274,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -308,12 +290,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -329,12 +305,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -354,12 +324,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -375,12 +339,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -395,12 +353,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -417,12 +369,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -444,12 +390,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -469,12 +409,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -842,7 +776,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.cache.timeout 11h 4m 34s",
+    "name": "checkout foo.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -860,12 +794,6 @@
     ],
     "cwd": "[CACHE]/git/foo.googlesource.com-foo",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -889,7 +817,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.cache.timeout 11h 4m 32s",
+    "name": "checkout foo.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -906,12 +834,6 @@
     ],
     "cwd": "[CACHE]/git/foo.googlesource.com-foo",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -961,7 +883,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.git checkout.timeout 11h 4m 31s",
+    "name": "checkout foo.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -982,7 +904,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       }
     },
     "name": "checkout foo.git checkout.makedirs",
@@ -997,12 +919,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1019,12 +935,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1040,12 +950,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1064,12 +968,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -1085,12 +983,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1105,12 +997,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -1127,12 +1013,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1163,7 +1043,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 29s",
+    "name": "checkout foo.apply foo:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1180,12 +1060,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -1227,7 +1101,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 28s",
+    "name": "checkout foo.apply foo:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1243,12 +1117,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -1284,7 +1152,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 26s",
+    "name": "checkout foo.apply foo:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,12 +1164,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/project",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -1319,12 +1181,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/project",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -1338,12 +1194,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/project",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout foo.apply foo:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/txt_roller.expected/success.json b/recipes/txt_roller.expected/success.json
index 4fc520a..59791ec 100644
--- a/recipes/txt_roller.expected/success.json
+++ b/recipes/txt_roller.expected/success.json
@@ -187,7 +187,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -206,10 +206,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -283,7 +279,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -302,10 +298,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -390,7 +382,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -411,7 +403,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:ci"
@@ -437,10 +429,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -469,10 +457,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -500,10 +484,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -535,10 +515,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -566,10 +542,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -596,10 +568,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -628,10 +596,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -665,10 +629,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -700,10 +660,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1253,7 +1209,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.cache.timeout 11h 4m 34s",
+    "name": "checkout foo.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1272,10 +1228,6 @@
     "cwd": "[CACHE]/git/foo.googlesource.com-foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1322,7 +1274,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.cache.timeout 11h 4m 32s",
+    "name": "checkout foo.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1340,10 +1292,6 @@
     "cwd": "[CACHE]/git/foo.googlesource.com-foo",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1428,7 +1376,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.git checkout.timeout 11h 4m 31s",
+    "name": "checkout foo.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1449,7 +1397,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000019.0
       },
       "realm": {
         "name": "project:ci"
@@ -1475,10 +1423,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1507,10 +1451,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1538,10 +1478,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1572,10 +1508,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1603,10 +1535,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1633,10 +1561,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1665,10 +1589,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1722,7 +1642,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 29s",
+    "name": "checkout foo.apply foo:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1740,10 +1660,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1820,7 +1736,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 28s",
+    "name": "checkout foo.apply foo:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1837,10 +1753,6 @@
     "cwd": "[START_DIR]/project",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1911,7 +1823,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout foo.apply foo:1234.timeout 11h 4m 26s",
+    "name": "checkout foo.apply foo:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1924,10 +1836,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1957,10 +1865,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
@@ -1986,10 +1890,6 @@
     ],
     "cwd": "[START_DIR]/project",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:ci"
       },
diff --git a/recipes/update_python_versions.expected/simple.json b/recipes/update_python_versions.expected/simple.json
index d99e03f..1612a0c 100644
--- a/recipes/update_python_versions.expected/simple.json
+++ b/recipes/update_python_versions.expected/simple.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/xrefs.expected/dry_run.json b/recipes/xrefs.expected/dry_run.json
index b9431f4..8a025c0 100644
--- a/recipes/xrefs.expected/dry_run.json
+++ b/recipes/xrefs.expected/dry_run.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/xrefs.expected/kythe.json b/recipes/xrefs.expected/kythe.json
index 230f55d..f501784 100644
--- a/recipes/xrefs.expected/kythe.json
+++ b/recipes/xrefs.expected/kythe.json
@@ -272,7 +272,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -290,12 +290,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -334,7 +328,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -352,12 +346,6 @@
     ],
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.cache.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -407,7 +395,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -428,7 +416,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       }
     },
     "name": "checkout pigweed.git checkout.makedirs",
@@ -443,12 +431,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git init",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -465,12 +447,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git remote",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -486,12 +462,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.set fetch.uriprotocols",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -511,12 +481,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git fetch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -532,12 +496,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git checkout",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -552,12 +510,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git rev-parse",
     "timeout": 60.0,
     "~followup_annotations": [
@@ -574,12 +526,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.git clean",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -601,12 +547,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule sync",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -626,12 +566,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.git checkout.submodule.git submodule update",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -662,7 +596,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -679,12 +613,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch patch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -726,7 +654,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,12 +670,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "infra_step": true,
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git fetch branch",
     "timeout": 1200.0,
     "~followup_annotations": [
@@ -783,7 +705,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:1234.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:1234.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -795,12 +717,6 @@
       "--detach"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.detach",
     "timeout": 600.0,
     "~followup_annotations": [
@@ -818,12 +734,6 @@
       "4"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.git submodule update",
     "timeout": 600,
     "~followup_annotations": [
@@ -837,12 +747,6 @@
       "-"
     ],
     "cwd": "[START_DIR]/co",
-    "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      }
-    },
     "name": "checkout pigweed.apply pigweed:1234.reattach",
     "timeout": 600.0,
     "~followup_annotations": [
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index c572a70..70dcc66 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -595,7 +595,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 38s",
+    "name": "checkout pigweed.cache.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -614,10 +614,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -691,7 +687,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.cache.timeout 11h 4m 37s",
+    "name": "checkout pigweed.cache.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -710,10 +706,6 @@
     "cwd": "[CACHE]/git/pigweed.googlesource.com-pigweed-pigweed",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -798,7 +790,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.git checkout.timeout 11h 4m 35s",
+    "name": "checkout pigweed.git checkout.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -819,7 +811,7 @@
     "luci_context": {
       "deadline": {
         "grace_period": 30.0,
-        "soft_deadline": -120.0
+        "soft_deadline": 1337000014.5
       },
       "realm": {
         "name": "project:try"
@@ -845,10 +837,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -877,10 +865,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -908,10 +892,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -943,10 +923,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -974,10 +950,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1004,10 +976,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1036,10 +1004,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1073,10 +1037,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1108,10 +1068,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1165,7 +1121,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 34s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1183,10 +1139,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1263,7 +1215,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 32s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1280,10 +1232,6 @@
     "cwd": "[START_DIR]/co",
     "infra_step": true,
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1407,7 +1355,7 @@
   },
   {
     "cmd": [],
-    "name": "checkout pigweed.apply pigweed:123456.timeout 11h 4m 31s",
+    "name": "checkout pigweed.apply pigweed:123456.timeout 10s (3)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1420,10 +1368,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1453,10 +1397,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },
@@ -1482,10 +1422,6 @@
     ],
     "cwd": "[START_DIR]/co",
     "luci_context": {
-      "deadline": {
-        "grace_period": 30.0,
-        "soft_deadline": -120.0
-      },
       "realm": {
         "name": "project:try"
       },