Backed out 3 changesets (bug 1883476, bug 1826375) for causing windows build bustages...