This reverts commit aae8524b, which was found to cause a few unexpected benchmark performance differences that need investigation.