Revert "Merge pull request #17499 from dominickuo/bug-982540"

This reverts commit 85c0ce7239d544add7be2d6053ed78e2b4a3dccf.
Merge branch 'v1.3' into v1.3t