Fix http/ws race by doing all face assignment in the websocket handler