EAP6-18: Rollback implementation