Revert "bacon: Relocate disk encryption metadata"

This reverts commit 4124e2327cd7faf551f6160b3ebb85221fe5626c.