Revert parts of 6864429a which utterly broke dbh_do() retries

Was never noticed because of undertesting, now should behave correctly
Changelogging for 728f32b5 and e705f529