Fixes #246, but we should figure out why addStream is happening.