I'd suggest removing this TODO comment. It's being tracked in github issues anyway so it's just noise.