When are we going to get rid of this TODO?