Revert "Reimplement START_GROUP/START_SUB_GROUP macros"

This reverts commit 5e5dcd9c8ba694a4e6dc9adeb7b81e2c2e58b26d.