Revert to bdece29b208b0e0fa12c9f37fbc3ce9d5b34630c - backing out of postgis work