Is this TODO still relevant?