Obviously this TODO should be fixed or removed.