Merge "Remove TODO of won't fix bug."