Fixed some missed rollback functions from BZ#1056655.