don't enforce the step after shipping to be 'paymentmethod'