And, reverted: https://github.com/mozilla/servo/pull/2685. Broken on mac. Maybe next week...