Back out fe7fa32e9423 (bug 848423) for Windows build bustage
CLOSED TREE