Backed out changeset a70f5add1982 (bug 950658) for breaking Windows builds