Making counter discovery compatible with recent changes.