diff --git a/.gitattributes b/.gitattributes
index 104b92a37c..bc99b4c6cd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,7 +9,7 @@
 /*.py  recipes
 /*.sh  recipes
 
-# Extensionless tools we want and support scripts.
+# Extensionless tools we want
 /apply_issue                  recipes
 /clang*                       recipes
 /depot-tools-auth             recipes
diff --git a/led b/led
index c273aa0888..7f7eeac1f0 100755
--- a/led
+++ b/led
@@ -7,6 +7,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+cipd_bin_setup
 
 exec "$MYPATH/.cipd_bin/led" "$@"
diff --git a/led.bat b/led.bat
index 1cbff244d8..857ad12d29 100644
--- a/led.bat
+++ b/led.bat
@@ -3,5 +3,5 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
-call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+call "%~dp0\cipd_bin_setup.bat"
 "%~dp0\.cipd_bin\led.exe" %*
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index 683d2b97f8..aa7e959cac 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -179,10 +179,6 @@ class GClientSmoke(GClientSmokeBase):
     self.check(res, self.gclient(['update']))
 
   def testConfig(self):
-    # Get anhy bootstrapping out of the way.
-    results = self.gclient(['version'])
-    self.assertEquals(results[2], 0)
-
     p = join(self.root_dir, '.gclient')
     def test(cmd, expected):
       if os.path.exists(p):
diff --git a/update_depot_tools b/update_depot_tools
index 81e917eb5a..bc5ca48689 100755
--- a/update_depot_tools
+++ b/update_depot_tools
@@ -112,17 +112,11 @@ function update_git_repo {
 }
 
 # Update git checkouts.
-if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
-  if [ -e "$base_dir/.git" ]; then
-    cd $base_dir
-    update_git_repo
-    cd - > /dev/null
-  fi
-
-  # Sync CIPD and CIPD client tools.
-  source "$base_dir/cipd_bin_setup.sh"
-  cipd_bin_setup
-
-  find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
+if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.git" ]
+then
+  cd $base_dir
+  update_git_repo
+  cd - > /dev/null
 fi
 
+find "$base_dir" -iname "*.pyc" -exec rm -f {} \;
diff --git a/update_depot_tools.bat b/update_depot_tools.bat
index ec1108c520..cfb44f0474 100644
--- a/update_depot_tools.bat
+++ b/update_depot_tools.bat
@@ -52,10 +52,5 @@ for /F %%x in ('git config --get remote.origin.url') DO (
 )
 call git fetch -q origin > NUL
 call git rebase -q origin/master > NUL
-if errorlevel 1 (
-  echo Failed to update depot_tools.
-  goto :EOF
-)
-
-:: Sync CIPD and CIPD client tools.
-call "%~dp0\cipd_bin_setup.bat"
+if errorlevel 1 echo Failed to update depot_tools.
+goto :EOF
diff --git a/vpython b/vpython
index 3fd62f2d76..d836ae7bbc 100755
--- a/vpython
+++ b/vpython
@@ -7,6 +7,6 @@
 MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
 source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
+cipd_bin_setup
 
 exec "$MYPATH/.cipd_bin/vpython" "$@"
diff --git a/vpython.bat b/vpython.bat
index 8aaf929751..a0de9c57ad 100644
--- a/vpython.bat
+++ b/vpython.bat
@@ -3,5 +3,5 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
-call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+call "%~dp0\cipd_bin_setup.bat"
 "%~dp0\.cipd_bin\vpython.exe" %*