INFR-25369 Rollback ui and shelf