Is this TODO not needed anymore?