Add back in xattr support