Undid linting fixes that broke more than they fixed