Backed out changeset d1b71de5bbc1 (bug 747831) for Windows bustage.