Now that the bulk of the packages have been made available in the
Bullseye based v2022dev2 we can revert
commit 788aa27a.