rolling back https://github.com/apache/incubator-streams/pull/140

to address critical test failures per STREAMS-238
STREAMS-230 should be re-opened
this PR reverts to the version that existed before merging https://github.com/apache/incubator-streams/pull/140

we need to re-open STREAMS-230, dive a bit deeper into implications of the issue there, and take special care that the next attempt to address the issue does not cause any test failures, regular or sporadic.