revert bad changes from civ gui update

- reverts changes from 75e583aeca7c0f5096e6dcb43392d77704982920
- entity_default still needs to be reviewed