Revert "Lint changes"

This reverts commit e00436b4096466af37b3e32c3f3277c3604d85ee.