Backout part of Bug 895116 for not building on Windows on CLOSED TREE