TUP-2422: only deal with for DI items.