Fix Cargo build

Servo's build changes conflict with the Cargo build. This splits them apart.