Removed todo comment and opened an issue on GH