Revert "City (fixed)"

This reverts commit 3c95f799ac1a3af5750e14d040c7476f985f4211.
City