Revert "Added bundling support"

This reverts commit ef43a7dca68c2ce1e2a38c09ad544a5dfe0d60ba.