Revert "Merge pull request #22656 from evelynhung/issue-m044960-1.4"

This reverts commit aca0326c9b14e20f42d64ed80bbf29dae5fd0903, reversing
changes made to 66b4b164536caf96529f702291b196773c34ad06.