Revert "Revert "Civilian round-start fix""

Should work now with my new update.  Please revert this revert before applying my fix, to avoid synch problems in git hub.