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

This reverts commit c1da4c9f2f3a3838554723cdb3eb91d23962b42f.