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

This reverts commit 198d749df8de8b09227f70864b1f3be777b552d0.