Removed issue with rollback registration happening twice.