Backed out changesets bfd0864f189d and dba042cbc381 (bug 877115) for Windows bustage.
CLOSED TREE