Revert "Making address format consistent with current CMS (likely to change)"

This reverts commit 9afba30365380cd5aa7272822c75e9d63a44b8ab.