This reverts commit a56c0ab6. This commit caused a visible performance degradation according to research done by Cyrille..