[EXPERIMENTAL] Convert bridges over to the new format. This needs a lot
of work, but should work fine.