Revert "Merge remote-tracking branch 'remotes/origin/websocket-close'"

This reverts commit 7b6485a135cdba6bee72f72061e11358ba8b60a1, reversing
changes made to 4788d759f143c09c86331cbd8ba84700a1994011.