Revert "Reconfigured bundles"

This reverts commit 22c310362a162f6273fbcf67ff42023310aa1165.
Reconfigured bundles