please remove this, not relevant to this bug, we have another bug already for this, the TODO is really useless