revert to not using BNeutral changes in Sfx class (for the time being)