Revert "Another try at that collapsible groups deal"

This reverts commit 6d4de069d3d42cf1e644010689f42a8ebe6691d4.
revert?