Backport fix for pbi10 removal