Revert "Merge pull request #12417 from evelynhung/issue-900399"

This reverts commit 998b22382dda6e136866a553d8665d9f9a8f3398.