Let's switch back to the vanilla group count