Revert "Merge pull request #15794 from vishalzambre/patch-1"

This reverts commit 6d800a909e24465ca6f3fa5206222fa7d78967f6, reversing
changes made to 6a051299f98ee43864326c6c0a4f7d169d22b3f8.

We don't apply non-security fixes to 3-2-stable branch!!!