This reverts commit fc011a72. This reverts commit 4ad6a0c9. This reverts commit 4b1eb4cf. Still causes Windows build bots to fail.