I don't see how the patch from bug 127073 could ever work. Attaching a patch.
Created attachment 393963 [details] Patch
Committed r258694: <https://trac.webkit.org/changeset/258694> All reviewed patches have been landed. Closing bug and clearing flags on attachment 393963 [details].
<rdar://problem/60631374>