Revert "Merge pull request #17790 from huchengtw-moz/system2/Bug_971554_reland-master"

This reverts commit eee964fc7e8dc519218dee6b72595ad0f7dd8231, reversing
changes made to bb7285e8f6c70bf10b0affbeb370fc041bdecff8.
Merge pull request #17797 from huchengtw-moz/revert-bug-971554

Revert "Merge pull request #17790 from huchengtw-moz/system2/Bug_971554_...