Revert "New bg_bundle field"

This reverts commit 3fdee36e50b4d89007b63f822b28de015281af3b.