BZ-12827 reverted address form