This reverts commit bb438f6c since it broke our Windows builders and we need more time to investigate the issue.