Disable big counters, with a bit more rigour.

Will be another commit, just waiting for cli tests to run to see if anything else fails.