Back out caa83f3d823e, Windows bustage.  r=bustage in a CLOSED TREE