Revert "Yet another attempt at fixing read stream races"

This reverts commit 7459cd3972784d00982f02aaa5bd1b628aaabfec.