Another attempt to fix windows buildbots.