issue #19735: Undo some linting that caused more problems than it solved