Try two of making the windows buildbot work.