This reverts commit 4856cfa89c. The change only slightly mitigated the issue, revert in favor of an alternative fix.
4856cfa89c