Revert "Bundling: Fix for new bundle"

This reverts commit 140c779fa60afe4c061eb03705fe533e5676c3c9.
Bundling: fix problem with new bundles