Revert "Civilian round-start fix"
Merge pull request #446 from ZomgPonies/revert-445-master

Revert "Civilian round-start fix"
Merge pull request #352 from ZomgPonies/master

fix