Remove this todo from release branch for now so it doesn't block point release.  (It is actually a todo for 0.5 that came back in a cherry-pick.)