Revert "Performance upgrade"

This reverts commit 36e90d3bc4d0528757481188dbbd2a95f67f004a.