Revert "Improve performance of MyTownDatasource.get(OrMake)Resident"

This reverts commit f0b3685f3e2cc0569c7d75f2de3e741429c4e784.