Revert "Account for Shipping being displayed later in checkout flow"

This reverts commit af59a7becb9d62913e438768ae6b0ececf716035.