Speculatively revert 132758 and 132768 to try to fix the Windows buildbots.