Can we get rid of this TODO?