Revert "optimizations meant to streamline location import"

This reverts commit 63bf8bb0fc6bacea7bb553c47fa80e6e3aafbbe0.
Merge pull request #613 from dimagi/cz

Revert "optimizations meant to streamline location import"