Add back SDP hack and create more robust connection negotiation