Backed out 2 changesets (bug 878032) because of Windows build bustage

Backed out changeset 3cb61a7d5746 (bug 878032)
Backed out changeset 627c03f469d8 (bug 878032)

Landed on a CLOSED TREE