diff --git a/DEPS b/DEPS
index 600b59919a..afe876d545 100644
--- a/DEPS
+++ b/DEPS
@@ -272,8 +272,6 @@ deps = {
   },
   'src/tools':
     'https://chromium.googlesource.com/chromium/src/tools@7fedcd5492f8cab7e7dda3389985625894d0071a',
-  'src/tools/swarming_client':
-    'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
 
   'src/third_party/accessibility_test_framework': {
       'packages': [
diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py
index 4aff74621f..a5f0e24608 100755
--- a/tools_webrtc/mb/mb.py
+++ b/tools_webrtc/mb/mb.py
@@ -364,12 +364,7 @@ class MetaBuildWrapper(object):
       if out:
         self.Print(out, end='')
       if err:
-        # The swarming client will return an exit code of 2 (via
-        # argparse.ArgumentParser.error()) and print a message to indicate
-        # that auth failed, so we have to parse the message to check.
-        if (ret == 2 and 'Please login to' in err):
-          err = err.replace(' auth.py', ' tools/swarming_client/auth.py')
-          self.Print(err, end='', file=sys.stderr)
+        self.Print(err, end='', file=sys.stderr)
 
       return ret