Revert "upgpkg: city-defaults 1-6"

This reverts commit c73e9d96c112520a19ddd2c8750a2f65d158e791.
Revert "upgpkg: city-defaults 1-7"

This reverts commit ee9764095676a11241bb7626b2b48df09c6ade05.