Is this TODO actually needed?