Revert handling of address in checkout process