Merge pull request #1359 from kurtmckee/fix-pre-commit-ci-failures