diff --git a/infra/bots/recipes.py b/infra/bots/recipes.py
index 2fe0086..6cdc365 100755
--- a/infra/bots/recipes.py
+++ b/infra/bots/recipes.py
@@ -1,9 +1,19 @@
-#!/usr/bin/env python
-
-# Copyright 2017 The LUCI Authors. All rights reserved.
+#!/bin/sh
+# Copyright 2019 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
+# We want to run python in unbuffered mode; however shebangs on linux grab the
+# entire rest of the shebang line as a single argument, leading to errors like:
+#
+#   /usr/bin/env: 'python -u': No such file or directory
+#
+# This little shell hack is a triple-quoted noop in python, but in sh it
+# evaluates to re-exec'ing this script in unbuffered mode.
+# pylint: disable=pointless-string-statement
+''''exec python -u -- "$0" ${1+"$@"} # '''
+# vi: syntax=python
+
 """Bootstrap script to clone and forward to the recipe engine tool.
 
 *******************
@@ -14,20 +24,17 @@
 To fix bugs, fix in the googlesource repo then run the autoroller.
 """
 
+# pylint: disable=wrong-import-position
 import argparse
 import json
 import logging
 import os
-import random
 import subprocess
 import sys
-import time
 import urlparse
 
 from collections import namedtuple
 
-from cStringIO import StringIO
-
 # The dependency entry for the recipe_engine in the client repo's recipes.cfg
 #
 # url (str) - the url to the engine repo we want to use.
@@ -219,9 +226,12 @@
 
   engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path)
 
-  return _subprocess_call([
-      VPYTHON, '-u',
-      os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
+  try:
+    return _subprocess_call([
+        VPYTHON, '-u',
+        os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
+  except KeyboardInterrupt:
+    return 1
 
 
 if __name__ == '__main__':
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index a6becdd..4a6b569 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -14,12 +14,12 @@
   "deps": {
     "depot_tools": {
       "branch": "master",
-      "revision": "99fe071354e3b3f176ee345bc98328e96d6c1fd1",
+      "revision": "7639f1999ac1d8992fc4fbb169d164b156d9a7f7",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "recipe_engine": {
       "branch": "master",
-      "revision": "9d31f1727653888912994380e7b9c35ad9ea8380",
+      "revision": "7f33bc0f23af3bb83d27b8cc31f5f35d189a1127",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },