Revert "removing TODO, its not a bug."

This reverts commit 12c44efccb3e99239520ca68149f5ee007603d28.
Revert "Revert "removing TODO, its not a bug.""

This reverts commit 0abecdabd3b38e0e0cd303fbf72a3b690a37f4fd.