Revert (part of) 1661517

https://bugzilla.mozilla.org/show_bug.cgi?id=1661517#c8

We can create a minimal revert patch, that may be more sustainable than reverting the patch that landed.

(thanks to @thorin for highlighting this, #40401 (comment 2740722))