Revert "Merged r11982 from trunk to 2.3-stable (#14346)"

This reverts commit b5998b59ab26a706ace9d1a31a52570b2851c5c1.