This is a rebased version of PR #11595 --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #11485 <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because: no code logic was changed <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: f70fc6644ddb142627c188ebbde2cc0a0282f9b4