Revert "Small fixes to resolve Cannot transition state via :next from :payment"

This reverts commit 5bdcf7d5beb478524ffa2db9b75838a351dda113.
Fixing bug with @order.next!