Revert "Merge pull request #18967 from leonazhao/bug992120_v1.3t"

This reverts commit aef737f4eae863949d4b42cd6c17339aec3a5fa0, reversing
changes made to 01b4910f2fb48b39686cab3e35166750a4d474ff.