Backed out changeset 219e33b5d773, ec0d3a478d52 (bug 1015629) for total win8 talos bustage, and some win7, too.