Why remove this TODO?  I believe it's still needed.