Rolled back to WebSockets
Merge pull request #948 from delving/13.06-websockets

Rolled back to WebSockets