Revert 0dd580b..89f2c74

This rolls back to commit 0dd580bab6e21d452c42a3b0e89ee17d4b1f412b.
counter