Back out the bfam stuff

I may have found the cure.