This PR has been merged, can we get rid of this TODO?