Can we remove the TODO and explain the problem a bit more and what we are currently doing?  I tend to see "TODO" as a comment telling yourself to go back and implement something before you actually push your code.  If we have made a design decision that has some drawbacks which we might not like in the future, we should just make a normal comment describing the decision and the potential drawbacks.  The TODO is implied.