This reverts commit a47339bf5db9ec1be2709e1e687c2b5d5df313e7.

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@29229 e39458fd-73e7-0310-bf30-c45bca0a0e42