Really Fix pbi package and tbz. Fixes #3274