fixup for bfd changes on trunk

not yet tested on the branch