Backed out changeset 5b3dd105258e for Windows build failures

--HG--
extra : rebase_source : 83cadf05aaff31283f52bca8e0c9b90b2d8c6cc0