Revert "PHOENIX-1496 Further reduce work in StatsCollector."

This reverts commit 3fa1ddccf782e8b708c3d1f13d7046fd8b511dce.