Revert "more robust stats recording in preparation for stats"

This reverts commit db2eb0083a56bcac96fd9935f544018d69048350.