Revert "Import Debian changes 5.3.0-6co1"

The latest upstream version already contains a FTBFS fix which I tested in my home branch on OBS and it build. So that we should revert our FTBFS fix and use upstream's instead as we discussed during the daily call.

This reverts commit 607054c2.