Comment 3 for bug 1884072

I'm attaching a debdiff containing two patches, one of them being a cherry-picked upstream commit, and the other one a trivial one-liner. This appears to fix the build on groovy, until we get the updated package from experimental.