Revert "Merge pull request #981 from methane/websocket"

This reverts commit 62cc262196951b67a13069444b889dc71758776c, reversing
changes made to c1028cf91286489ef075a33c91d29d1efea8d200.