Backed out changeset 0d7d5af0b1b1 (bug 266532) for Windows bustage.
CLOSED TREE