Fixed #22645 -- Restored the GIS models in models.py.

This reverts commit cebd8753c65ec33730f495bb7085f34884f7c3d6
and does some additional cleanup.