Revert "Revert "revert static-groups""

This reverts commit 888bfed99f8bb138aefc782bd6436df299982ffb.