Revert changes related to the close-stream work.