Undo linting fixes so that CI pull request is clean