Revert "v1.0 drmjc's generic bundle"

This reverts commit 49d1ff395ce91ec56edf13896b622cfa32de1650.
Revert "Revert "v1.0 drmjc's generic bundle""

This reverts commit 69ae5480b356ee1b3e2bbe91684d5c28c2f3303f.
Revert "v1.0 drmjc's generic bundle"

This reverts commit 49d1ff395ce91ec56edf13896b622cfa32de1650.
Revert "Revert "v1.0 drmjc's generic bundle""

This reverts commit 17c332cf92efcf3b33b6a690d7692fb32c1afea5.