diff --git a/tools/msvs/find_python.cmd b/tools/msvs/find_python.cmd
deleted file mode 100644
index f2a779290e8104..00000000000000
--- a/tools/msvs/find_python.cmd
+++ /dev/null
@@ -1,51 +0,0 @@
-@IF NOT DEFINED DEBUG_HELPER @ECHO OFF
-SETLOCAL
-:: If python.exe is in %Path%, just validate
-FOR /F "delims=" %%a IN ('where python 2^> NUL') DO (
-  SET need_path=0
-  SET p=%%~dpa
-  IF NOT ERRORLEVEL 1 GOTO :validate
-)
-
-:: Query the 3 locations mentioned in PEP 514 for a python2 InstallPath
-FOR %%K IN ( "HKCU\Software", "HKLM\SOFTWARE", "HKLM\Software\Wow6432Node") DO (
-  SET need_path=1
-  CALL :find-main-branch %%K
-  :: If validate returns 0 just jump to the end
-  IF NOT ERRORLEVEL 1 GOTO :validate
-)
-EXIT /B 1
-
-:: Helper subroutine to handle quotes in %1
-:find-main-branch
-SET main_key="%~1\Python\PythonCore"
-REG QUERY %main_key% /s | findstr "2." | findstr InstallPath > NUL 2> NUL
-IF NOT ERRORLEVEL 1 CALL :find-key %main_key%
-EXIT /B
-
-:: Query registry sub-tree for InstallPath
-:find-key
-FOR /F "delims=" %%a IN ('REG QUERY %1 /s  ^| findstr "2." ^| findstr InstallPath') DO IF NOT ERRORLEVEL 1 CALL :find-path %%a
-EXIT /B
-
-:: Parse the value of %1 as the path for python.exe
-:find-path
-FOR /F "tokens=3*" %%a IN ('REG QUERY %1 /ve') DO (
-  SET pt=%%a
-  IF NOT ERRORLEVEL 1 SET p=%pt%
-  EXIT /B 0
-)
-EXIT /B 1
-
-:: Check if %p% holds a path to a real python2 executable
-:validate
-IF NOT EXIST "%p%python.exe" EXIT /B 1
-:: Check if %p% is python2
-"%p%python.exe" -V 2>&1 | findstr /R "^Python.2.*" > NUL
-IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
-:: We can wrap it up
-ENDLOCAL & SET pt=%p%& SET need_path_ext=%need_path%
-SET VCBUILD_PYTHON_LOCATION=%pt%python.exe
-IF %need_path_ext%==1 SET Path=%Path%;%pt%
-SET need_path_ext=
-EXIT /B %ERRORLEVEL%
\ No newline at end of file
diff --git a/vcbuild.bat b/vcbuild.bat
index a765bcb439b3c5..78644fbaa95555 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -254,7 +254,8 @@ goto run
 if defined noprojgen goto msbuild
 
 @rem Generate the VS project.
-call :run-python configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG% %link_module%
+echo configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG% %link_module%
+python configure %configure_flags% --dest-cpu=%target_arch% --tag=%TAG% %link_module%
 if errorlevel 1 goto create-msvs-files-failed
 if not exist node.sln goto create-msvs-files-failed
 echo Project files generated.
@@ -443,7 +444,7 @@ if defined test_node_inspect goto node-test-inspect
 goto node-tests
 
 :node-check-deopts
-call :run-python tools\test.py --mode=release --check-deopts parallel sequential -J
+python tools\test.py --mode=release --check-deopts parallel sequential -J
 if defined test_node_inspect goto node-test-inspect
 goto node-tests
 
@@ -465,7 +466,8 @@ if "%config%"=="Debug" set test_args=--mode=debug %test_args%
 if "%config%"=="Release" set test_args=--mode=release %test_args%
 echo running 'cctest %cctest_args%'
 "%config%\cctest" %cctest_args%
-call :run-python tools\test.py %test_args%
+echo running 'python tools\test.py %test_args%'
+python tools\test.py %test_args%
 goto test-v8
 
 :test-v8
@@ -477,7 +479,7 @@ goto lint-cpp
 :lint-cpp
 if not defined lint_cpp goto lint-js
 call :run-lint-cpp src\*.c src\*.cc src\*.h test\addons\*.cc test\addons\*.h test\addons-napi\*.cc test\addons-napi\*.h test\cctest\*.cc test\cctest\*.h test\gc\binding.cc tools\icu\*.cc tools\icu\*.h
-call :run-python tools/check-imports.py
+python tools/check-imports.py
 goto lint-js
 
 :run-lint-cpp
@@ -493,7 +495,7 @@ for /f "tokens=*" %%G in ('dir /b /s /a %*') do (
 ( endlocal
   set cppfilelist=%localcppfilelist%
 )
-call :run-python tools/cpplint.py %cppfilelist% > nul
+python tools/cpplint.py %cppfilelist% > nul
 goto exit
 
 :add-to-list
@@ -553,14 +555,6 @@ echo   vcbuild.bat link-module my_module.js : bundles my_module as built-in modu
 echo   vcbuild.bat lint                     : runs the C++ and JavaScript linter
 goto exit
 
-:run-python
-call tools\msvs\find_python.cmd
-if errorlevel 1 echo Could not find python2 & goto :exit
-set cmd1="%VCBUILD_PYTHON_LOCATION%" %*
-echo %cmd1%
-%cmd1%
-exit /b %ERRORLEVEL%
-
 :exit
 goto :EOF
 
@@ -573,9 +567,8 @@ rem ***************
 set NODE_VERSION=
 set TAG=
 set FULLVERSION=
-:: Call as subroutine for validation of python
-call :run-python tools\getnodeversion.py > nul
-for /F "tokens=*" %%i in ('"%VCBUILD_PYTHON_LOCATION%" tools\getnodeversion.py') do set NODE_VERSION=%%i
+
+for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i
 if not defined NODE_VERSION (
   echo Cannot determine current version of Node.js
   exit /b 1