Revert "Sync with Debian"

This reverts commit b0471bd16d7a10e491cb7ac4fd9c2fa4f9eb1475.