Removed TODO that was done.

Review: https://reviews.apache.org/r/22577