Revert "Change lint settings (workaround)"

This reverts commit a39864c9254910871d95836d7c87184d8ce4defe.
Fix lint errors