Revert "Merge pull request #14214 from crh0716/944230"

This reverts commit 32c7efdaf9039be5f9f09fee3086a442104a60a3.