Revert "Removed TODO"

This reverts commit 5140df9437c86f364c718cac2e46d9142e4918b3.
Removed TODO