Backed out changeset c33ec815962f (bug 1036639) for windows checktest failures.