Backed out changeset 8d3c3420986b and Windows changes from changeset 0943558ecc1f to fix Windows bustage.