Revert "These should definitely be Counters. Best I can tell all the others are correct."

^What was that guy smoking? Those are Gauges. Should have listened to me the first time.

This reverts commit 74c4c9578479b9357f5153cc6402dee5d72d2998.