Revert "Switch to source format 3.0 (quilt) due to the xz tarball."

This reverts commit 81958b8c.

The X Strike Force does not like format 3.0 (quilt) since it prevents
easy cherry-picks from upstream branches.  Upstream tarballs will have
to be repacked, though.