This reverts commit 5eb94454. It has caused an increase in variance of performance test T9630, causing CI to fail.