The PR had some unforseen perf regressions that are not as easy to find. Revert the PR for now. This reverts commit 6ae8912a3e, reversing changes made to 86d6d2b738.
6ae8912a3e
86d6d2b738