Revert "Bug 1046554 - Follow-up, fix linter issues r=me"

This reverts commit 25701a4f9fc4bd1d1dc4a1d4bedfe66ee8c94502.