Updating patch for 8.2.x branch.
Removing comment as mentioned by @berdir