See if we can find a cleaner way of fixing https://bugs.webkit.org/show_bug.cgi?id=200241 and https://bugs.webkit.org/show_bug.cgi?id=199769.