diff --git a/vpython b/vpython
index c697427830..7484898f29 100755
--- a/vpython
+++ b/vpython
@@ -34,20 +34,13 @@ then
 fi
 
 
-base_dir=$(dirname "$0")
+MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
-source "$base_dir/cipd_bin_setup.sh"
+source "$MYPATH/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-# If Python bootstrapping is not disabled, make sure Python has been
-# bootstrapped and add it to the front of PATH.
-if [[ $MINGW != 0 && $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
-  if [[ ! -e $base_dir/python_bin_reldir.txt ]]; then
-    source "$base_dir/bootstrap_python3"
-    bootstrap_python3
-  fi
-  PYTHON_BIN_RELDIR="$base_dir/$(cat $base_dir/python_bin_reldir.txt | xargs echo)"
-  PATH="$PYTHON_BIN_RELDIR":"$PYTHON_BIN_RELDIR/Scripts":"$PATH"
-fi
+base_dir=$(dirname "$0")
+PYTHON_BIN_RELDIR="$(cat $base_dir/python_bin_reldir.txt | xargs echo)"
+PATH="$PYTHON_BIN_RELDIR":"$PYTHON_BIN_RELDIR/Scripts":"$PATH"
 
-exec "$base_dir/.cipd_bin/vpython" "$@"
+exec "$MYPATH/.cipd_bin/vpython" "$@"
diff --git a/vpython3 b/vpython3
index bc31333e1c..580669a6d3 100755
--- a/vpython3
+++ b/vpython3
@@ -34,20 +34,13 @@ then
 fi
 
 
-base_dir=$(dirname "$0")
+MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
-source "$base_dir/cipd_bin_setup.sh"
+source "$MYPATH/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-# If Python bootstrapping is not disabled, make sure Python has been
-# bootstrapped and add it to the front of PATH.
-if [[ $MINGW != 0 && $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
-  if [[ ! -e $base_dir/python3_bin_reldir.txt ]]; then
-    source "$base_dir/bootstrap_python3"
-    bootstrap_python3
-  fi
-  PYTHON3_BIN_RELDIR="$base_dir/$(cat $base_dir/python3_bin_reldir.txt | xargs echo)"
-  PATH="$PYTHON3_BIN_RELDIR":"$PYTHON3_BIN_RELDIR/Scripts":"$PATH"
-fi
+base_dir=$(dirname "$0")
+PYTHON3_BIN_RELDIR="$(cat $base_dir/python3_bin_reldir.txt | xargs echo)"
+PATH="$PYTHON3_BIN_RELDIR":"$PYTHON3_BIN_RELDIR/Scripts":"$PATH"
 
-exec "$base_dir/.cipd_bin/vpython3" "$@"
+exec "$MYPATH/.cipd_bin/vpython3" "$@"