Revert last commit and place UpdateAllStats in a better place.