I think this TODO / HACK comment are not relevant here.