diff --git a/download_from_google_storage b/download_from_google_storage
index 41d6e81236..74e1e83f93 100755
--- a/download_from_google_storage
+++ b/download_from_google_storage
@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec $base_dir/vpython "$base_dir/download_from_google_storage.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/download_from_google_storage.py" "$@"
diff --git a/download_from_google_storage.bat b/download_from_google_storage.bat
index f050082289..f1f2d21616 100755
--- a/download_from_google_storage.bat
+++ b/download_from_google_storage.bat
@@ -9,4 +9,4 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%~dp0\vpython "%~dp0\download_from_google_storage.py" %*
+python "%~dp0\download_from_google_storage.py" %*
diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index 57378aae21..3dcc862439 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/fetch b/fetch
index 3a940a2879..bea6718c77 100755
--- a/fetch
+++ b/fetch
@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec $base_dir/vpython "$base_dir/fetch.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/fetch.py" "$@"
diff --git a/fetch.bat b/fetch.bat
index 3e226538c6..5f8019a19d 100755
--- a/fetch.bat
+++ b/fetch.bat
@@ -12,4 +12,4 @@ call "%~dp0\update_depot_tools.bat"
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%~dp0\vpython "%~dp0\fetch.py" %*
+python "%~dp0\fetch.py" %*
diff --git a/fetch.py b/fetch.py
index 72e52c7967..56abfb9a6d 100755
--- a/fetch.py
+++ b/fetch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/gclient b/gclient
index 22c9295eba..4ff6b3cbda 100755
--- a/gclient
+++ b/gclient
@@ -5,21 +5,18 @@
 
 base_dir=$(dirname "$0")
 
-# Update depot_tools unless DEPOT_TOOLS_UPDATE is set to 0
-if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
-  if [[ "#grep#fetch#cleanup#diff#setdep#" != *"#$1#"* ]]; then
-    "$base_dir"/update_depot_tools "$@"
-    case $? in
-      123)
-        # msys environment was upgraded, need to quit.
-        exit 0
-        ;;
-      0)
-        ;;
-      *)
-        exit $?
-    esac
-  fi
+if [[ "#grep#fetch#cleanup#diff#setdep#" != *"#$1#"* ]]; then
+  "$base_dir"/update_depot_tools "$@"
+  case $? in
+    123)
+      # msys environment was upgraded, need to quit.
+      exit 0
+      ;;
+    0)
+      ;;
+    *)
+      exit $?
+  esac
 fi
 
-PYTHONDONTWRITEBYTECODE=1 exec $base_dir/vpython "$base_dir/gclient.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
diff --git a/gclient-new-workdir.py b/gclient-new-workdir.py
index 621606dd81..e9eee62b1a 100755
--- a/gclient-new-workdir.py
+++ b/gclient-new-workdir.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/gclient.bat b/gclient.bat
index 7b7acf5132..5aaff866c5 100755
--- a/gclient.bat
+++ b/gclient.bat
@@ -4,17 +4,12 @@
 :: found in the LICENSE file.
 setlocal
 
-:: Shall skip automatic update?
-IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :SKIP_UPDATE
-
 :: Synchronize the root directory before deferring control back to gclient.py.
 call "%~dp0update_depot_tools.bat" %*
 
-:SKIP_UPDATE
-
 :: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
 :: standalone, but allow other PATH manipulations to take priority.
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%~dp0\vpython "%~dp0\gclient.py" %*
+python "%~dp0gclient.py" %*
diff --git a/gclient.py b/gclient.py
index 35df62f1d6..f940f68308 100755
--- a/gclient.py
+++ b/gclient.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/roll-dep b/roll-dep
index 8875bef75a..19ddb8058a 100755
--- a/roll-dep
+++ b/roll-dep
@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec $base_dir/vpython "$base_dir/roll_dep.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/roll_dep.py" "$@"
diff --git a/roll-dep-svn b/roll-dep-svn
index f4f3a3fd92..1d65c7b484 100755
--- a/roll-dep-svn
+++ b/roll-dep-svn
@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec $base_dir/vpython "$base_dir/roll_dep_svn.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/roll_dep_svn.py" "$@"
diff --git a/roll-dep-svn.bat b/roll-dep-svn.bat
index af6ccd8d8b..6ff5db78f1 100755
--- a/roll-dep-svn.bat
+++ b/roll-dep-svn.bat
@@ -9,4 +9,4 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%~dp0\vpython "%~dp0\roll_dep_svn.py" %*
+python "%~dp0\roll_dep_svn.py" %*
diff --git a/roll-dep.bat b/roll-dep.bat
index 9b4cfee78d..c49c88dc51 100755
--- a/roll-dep.bat
+++ b/roll-dep.bat
@@ -9,4 +9,4 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%~dp0\vpython "%~dp0\roll_dep.py" %*
+python "%~dp0\roll_dep.py" %*
diff --git a/roll_dep.py b/roll_dep.py
index 4c20d5b66b..a41be48120 100755
--- a/roll_dep.py
+++ b/roll_dep.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/roll_dep_svn.py b/roll_dep_svn.py
index c569969cf6..a7c9a28033 100755
--- a/roll_dep_svn.py
+++ b/roll_dep_svn.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.