Revert changes for #30388 as needed
A better patch for #30388 (moved) landed on esr60 (https://hg.mozilla.org/releases/mozilla-esr60/rev/5749f5b42cbf5a972bc8c398ed377977da35dbd2). We should revert our patches where needed.
A better patch for #30388 (moved) landed on esr60 (https://hg.mozilla.org/releases/mozilla-esr60/rev/5749f5b42cbf5a972bc8c398ed377977da35dbd2). We should revert our patches where needed.