Revert "Merge branch 'feat-selected-group-by'"

This reverts commit 6aa3b79cb0b41453902aaeb6413d503119bdee91, reversing
changes made to 3843e0dc363d163ec0c187d44768e8de20db26e1.