Revert "Switched from new to bfam"