Rework previous commit move the if block into _doStreamBind().
Backout previous (silly) change.