Revert "Merge pull request #17179 from cctuan/979827" for breaking B2G desktop builds on TBPL

This reverts commit c23af48b0a02667ae378bd32e8ae60eaced8e4c1, reversing
changes made to d2651c13d6370d62bf833b31c7e2e5f054510136.