Reverted because Windows buildbot started failing This reverts commit 6bd46e713c6d8deda7bdae8b1efadb99c88b4443.