Revert "Merge pull request #18308 from cctuan/968661-3"

This reverts commit 5888971a38db832241e0cf40e4f9d5e32333db51, reversing
changes made to 76c94ac5dc3b8e17cc23d9cc3e2662b0d5d28b2e.

see https://bugzilla.mozilla.org/show_bug.cgi?id=968661#c35