Revert AddressUtils move for now