When are we going to resolve this TODO?