Revert "Merge pull request #18565 from cctuan/973454-2"

This reverts commit 16564862869a3667af220466e48f7840c7beb8ff, reversing
changes made to 0814a85e335006475d995212691545af87e97185.
Revert "Merge pull request #17842 from EragonJ/bug-973440"

This reverts commit afcd647bb13598c1a101ac900207f4b479d26734, reversing
changes made to 6f689126518660ec160aecc25432cf47d10662eb.