Prototyping fix for #3227 (WebsocketTransport only)