Is this TODO still required?