Revert "Merge branch 'origin/feature/SpawnLogic'"

This reverts commit b6f167521bf427f10e45439d6e1fe0c4bd9cbd03, reversing
changes made to f6b4c9d629460dd234110fb742a2345cbd422d8e.