Add ability to rollback the cib