Reverted 83490cd059c34217191a2796ea5462c57c69f2bb to take out pyshp/multipolygon stuff