I think this TODO was added by Matei in the the code that was moved here (see the lines below this in the diff).