Reverted because Windows buildbot started failing This reverts commit b642fd5ee250247ccefb38099169b4ee8ac4112b.