diff --git a/bootstrap/win/win_tools.bat b/bootstrap/win/win_tools.bat
index 8861c90..43f38a4 100644
--- a/bootstrap/win/win_tools.bat
+++ b/bootstrap/win/win_tools.bat
@@ -60,12 +60,20 @@
 
 
 :GIT_CHECK
-goto :GIT_1852_CHECK
+goto :GIT_190_CHECK
 
 
 :GIT_190_CHECK
 if "%DEPOT_TOOLS_GIT_190%" == "0" goto :GIT_1852_CHECK
-set GIT_VERSION=1.9.0.chromium.1
+:: Clean up a couple of known broken releases
+for /l %%i in (1,1,2) do if exist "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin" (
+  rmdir /s /q "%WIN_TOOLS_ROOT_DIR%\git-1.9.0.chromium.%%i_bin"
+)
+set GIT_VERSION=1.9.0.chromium.3
+for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i
+for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VERMINOR=%%j)
+if %VERMAJOR% lss 5 set GIT_VERSION=1.9.0.chromium.3-xp
+if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set GIT_VERSION=1.9.0.chromium.3-xp
 set GIT_BIN_DIR=git-%GIT_VERSION%_bin
 set GIT_ZIP_FILE=%GIT_BIN_DIR%.zip
 set GIT_ZIP_URL=https://commondatastorage.googleapis.com/chrome-infra/%GIT_ZIP_FILE%