Add back the hack exiv2, it's needed after all