Fix a derp

Change-Id: I0ba3fde66c507b1e7c480a633ab7cc83ab20ec0a
Revert one_confirm as default behaviour

Change-Id: Ib1a04ecd0cf731d830c19c780eab009cb70a800d
Revert "Revert one_confirm as default behaviour"

This reverts commit 6c946e5bc0f987f7ad44c669cdf09d8a0ba874c0.