Backed out changeset 8553d6d258cc (bug 952206) for Windows bustage.
CLOSED TREE