This reverts commit d57770ac, and adds 2 patches from Debian.
Attach a file by drag & drop or click to upload
