This TODO only exists in EE, and since it's a TODO there's no real point
in backporting it. As such we'll just get rid of it.