Revert "More stats counters by step breakdown"

This reverts commit d8f781642137c16146a00a8e44080e9efcb172da.