Fix the Windows buildbot after r35032