Backed out the hack that reversed ITEM_REPORT_XATTRS with