Avoid ad-hoc bundles in MakeTemporaryBundleFromTemplate, leak