Revert "Merge branch 'WorkingBundles'"

This reverts commit e2bf5cf5614ba0e91e6c918efc0d9eb550230b5e, reversing
changes made to a27be3f29c739625c8ae89cf4f8a1193b3682a74.