Fix rust-servo branch’s build error.
Fix rust-servo branch’s build error (rest).
Rebase merge rust-servo (will be backed out immediately after).
Revert "Rebase merge rust-servo (will be backed out immediately after)."

This reverts commit 25c81b3ade84034c0105b56de74a9fc6f6236350, reversing
changes made to 9ef25aa20e36ec761b33d67253801780a76c8a55.