Revert "Sync with Debian"

This reverts commit 6552d9ef938530185d417b2ce5de7efe568d9066.