Revert BB changes that broke the fields