Let's just remove the TODO and open a bug that point to the line.

I've never seen TODOs actually fully removed, and we never triage TODOs