WIP: checking iOS fix for *T removal