Revert "[Consolidated] Different spawn groups"

This reverts commit 156f29d24df42530ab9fae98a335f1a5f856f702.