[21.0, urgent] Re: 21.2.9: package adding broken