Backport to Servo's Rust