Revert websocket, fix registration