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

This reverts commit ca34a11e16c3583eda059a7fea7d88acc67f83a4, reversing
changes made to 56f15bef5b23dcb239bfa14bd691f530ab46e603.