Remove TODO since prior patch fixes it.