Same as pending, let's remove the `TODO`.  Instead of having the `TODO` let's just open a PR that addresses the issue, so that we can discuss it.