Revert "Merge pull request #5330 from alexanderkyte/dedup_mkbundle"