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