Backed out changeset 735394aa3813 (bug 1046087) for Windows bustage.
CLOSED TREE