Revert "Merge pull request #21567 from cctuan/1035453"

This reverts commit c07e2d88ec49691f92c3ad552f1c2b3a6098c76e.
Revert "Merge pull request #21773 from lissyx/bug1030063_2.0"

This reverts commit 72fef00c8c7bc96927f70fbff2c955be7410aacf, reversing
changes made to f72b8071f3784998135d4afd94a3de1b2184910b.