Revert "Merge branch 'feature/websocket'"

This reverts commit a92454dfa7513221a41ec24a0c4d61349d327f21, reversing
changes made to fe4d3abf426e9928ffb11407b2c5f96fe224603c.