Revert "Revert to 3358305"

This reverts commit e460ad97c73e00dbdcd3ee9e16cb2bf4c2ecd7d6.
Started ignoring /obj