Implement RFE #326532: remove BonoboStream usage from