Revert "Merge pull request #23311 from mozfreddyb/bug-1056882" for Linter bustage

This reverts commit 503d3c4e4c779f31ccb768a8ccc2b505aff72e83, reversing
changes made to 14a2fef47142cd873df27a6c846fcd9f854a75e6.