Partially revert r272973, since it appears to have caused a launch regression.
Created attachment 420964 [details]
It seems the macOS test failure is unrelated, since this patch is iOS only.
Committed r273162: <https://commits.webkit.org/r273162>
All reviewed patches have been landed. Closing bug and clearing flags on attachment 420964 [details].