Backout f710f8fb2ab0 for not building on windows
Backout 2201d650ac90 for not building on Windows on a CLOSED TREE