Revert upstream freeciv server patches breaking AI defense

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>