Revert changes from the rustup_20141124 branch.

We want to make changes to rust-mozjs before the Rust upgrade is
finished.