Moving from commit_on_success to atomic for upgrade path