Backed out changeset 4d3c5b18b800 (bug 1085175) for Windows bustage.
CLOSED TREE