Can we remove this "TODO" and create an issue instead. TODOs are just lost noise.