Revert "[Consolidated] Different spawn group types into one"

This reverts commit 14d3409ed8b8dce8e1129bea54616f632ef24788.