Revert: Switch from new to bfam