Revert "Improve performance of MyTownDatasource.get(OrMake)Resident" - seems to make MyTown unusable.

This reverts commit b11a2a97b0f59b1723ff17a93e8756aa8331adcb.