[12] Update TODO after failed patch approach.