Hah, this TODO is actually done, so it can be removed.