Fixing issue with bundles from pre 6.1 instances