bors-servo

:hourglass: Trying commit e668042fdbfebbde5f69bb6c2f54223f15e5a53c with merge 32f598ef5a8600247cfde797dcbe9493e547609b...

:broken_heart: Test failed - [linux-rel-css](http://build.servo.org/builders/linux-rel-css/builds/9375)

:umbrella: The latest upstream changes (presumably #20678) made this pull request unmergeable. Please resolve the merge conflicts.