Yeah, that whole sentence is rather screwy, IMO.  I put the TODO back even though this PR satisfies what the original TODO said.  I'll try to revisit this later.