This reverts commit 26909d9d, see
<https://bugs.documentfoundation.org/show_bug.cgi?id=106792#c10> for why this
was wrongly addressing symptoms, not the root cause.  Work on a proper fix is
ongoing.