Revert since it's doesn't fix the lint problem