This reverts commit 1df908f33f. The expected performance improvements are essentially non-existent.
1df908f33f