Revert "xz: more edits to xz compression"

This reverts commit 0780571f43f40df5d5521204f95e1df34578c604.