Garland merge updated .gitattributes, fixup the difference before merging anything else :>
This reverts commit 1471a632bb.
1471a632bb