Revert "Merge pull request #12261 from snowmantw/issue905889"

This reverts commit ff5f7fa1a0fc849d9b2e5c325963c6ebd51ccd12.
Merge pull request #12678 from timdream/revert-bug905889-v1.2

Revert "Merge pull request #12261 from snowmantw/issue905889"