We should resolve this TODO before landing. I haven't checked yet myself. :)