INFR-25344 - Rollback spinner