Use a different workaround that fixes both #1809 and #1738.
Use a different workaround that fixes both #1809 and #1738.

servo/webrender,servo/webrender,servo/webrender,servo/webrender,servo/webrender,servo/webrender