Backed out changeset c3b01d22caa9 (bug 912959) for Windows bustage.