Checkout still fails when removing :address from checkout flow

Fixes #3142