Backport use_tunneled_reply