Fix the Windows build, take 2.
Update buildbot config.