Hackily make lint pass again

Test Plan: `make lint`

Auditors: joel