Revert the main change from !2876 (merged). Multiple people have reported that the 64-bit amd64/msbuild tool fails in cases that the 32-bit msbuild works. Drop our change pending further investigation and hopefully a fix to VS.
Fixes: #18904 (closed), #19037 (closed)
This will create a new commit in order to revert the existing changes.