Back out changeset c98cb03a8475 (Bug 1098134) for Windows build bustage.