Is this TODO no longer relevant?