This has been merged now. I think the TODO can be removed.