Temporarily revert 132764 to see if it fixes the Windows buildbot.