Remove a TODO that was due to server-side issue.