Back out 576ab48e68c2:84f2c5b57c00 (bug 872338) for Windows build failures and various and sundry test failures