reverted, working except for xattr