revert auto linting and manual merge 32bfeaf..e42e0b1