Revert lint fix and replace with a hack