Fixed to work with the latest xattr.diff.