Remove @commit_on_success, this should really not be necessary anymore