Bug 850039 - Fix the linter again