Revert "Make address fields text fields in the db"

This reverts commit d2f819d1284636b67666f24568d8917b79b54f00.

Change-Id: I17d15c3025cc0dd017e8a5b2bba63e72f58e1c1d