This TODO has been fixed.