Revert #1; add option to only listen on subscribed streams

Based on the comments from pull request #1.