Back out a28cd2a8b397 (bug 992105) for Windows build bustage