bug_29467 (https://gitweb.torproject.org/user/gk/tor-browser.git/log/?h=bug_29467) has the backport and contains two patches (first the backout of the workaround, commit c718fc1c2a206404eba5a3357a9f683fcd72814e, and then Mike's actual patch, commit 26829ceec6f0d0a71c9a83562bf2adb83945a99b).
Trac: Keywords: TorBrowserTeam201902 deleted, TorBrowserTeam201902R added Status: new to needs_review
Thanks. Cherry-picked on top of tor-browser-60.5.1esr-8.5-1 (commits 9b575de574d95df16c34e64e38aa6d0b53b76837 and 8de1662514e5191715055479b503dbb016899e84).
Trac: Resolution: N/Ato fixed Status: merge_ready to closed