Revert "explicit complete" commits

Until we get some testing done on them.

Revert "Disable transition to "complete" via "next""
This reverts commit ed01c51bc5b90d0d8e56a9a51855fcef0c14ccfa.

Revert "Always include "confirm" step"
This reverts commit bf6b2d750b6923f34ae4fe03085449dce56f7ef2.