Backed out changeset 933bf791b773 (bug 897735) for Windows test bustage.
CLOSED TREE