[FIX] Packaging: backport of 134716308266ff