CA-118762: Bring self.ty back