Revert "xz: fixes for xz code"

This reverts commit d500261860450ad34583cbc5bc64c7d63ad3bbeb.