Revert "Experimental performance changes"

This reverts commit df40e656b52e704863e2aaae84093761a328561b.