Revert "More optimization on stats"

This reverts commit 7b10a0dd05085fd7d6c33ef7f0170ba94c8bf2f0.