Revert "Merge pull request #14717 from malini/v1.3"

This reverts commit 8d2969477c0e1b9ab2ea97a211b3a16df8b3de45, reversing
changes made to 035ecebb6449473f90907292896f1ebdbddf3bf0.