Backed out changeset a3250bad7f3c (bug 902799) for build failures on Windows