Undid my last change.

I need to do more testing. It's unclear whether the errors we're getting mean the zip5 or the zip5+zip4 is outside the district.