Tagged compat-5-6-removal by nthykier@master.debian.org