This TODO seems to have been fixed.