Let me send you a quick PR removing the TODO then, thanks.