Revert "Return specific group state if there is one (#115866)" This reverts commit 350ca48d4c.
350ca48d4c