Remove workarounds for mozilla/servo#848 and mozilla/servo#1021.