You can drop this TODO, this is true all over the codebase.