INFR-25369 Rollback logic