Enemy spawn fixes
Revert "Enemy spawn fixes"

This reverts commit 45eaf1b97c683c4a17c63662f9d6c893447fecc6.
Merge remote-tracking branch 'origin/master'