Revert "MB-9956 Add extra opaque to closestream"

This reverts commit e0a8dba43ea2f47cd4dbb0502af349242fbf84c7.