Code

Dropped most changes introduced in etch-backports.