going back to xhr-polling until we have more time to sort out the WS issue