I've opened a PR upstream to integrate the recent changes: golangci/golangci-lint#5707

I realized after I'd already written and tested the PR that golangci-lint policy requires the author of the linter to make all changes involving their linter.

@jgautheron I'm leaving this here so you have the diff when it comes time to do a bump upstream.