Backed out 2 changesets (bug 919936) for Windows build bustage

Backed out changeset 2f879cfc861f (bug 919936)
Backed out changeset 8ce7c4424b8a (bug 919936)
Automatic merge