Revert "Merge branch 'CleanUpAndUseBundle'"

This reverts commit 88d58e1a6a4b5dc89e06e0277808c8fa1c2ea635, reversing
changes made to 902a6d9f11a724611a8aaf36234fb59ec97403ca.
Updates
A