If we accept this PR without resolving this TODO, perhaps we should file an issue for it so we don't forget about it?