revert recent changes to rstats and cstats