Merge "Attempt "fix" the broken QUIC packet to be slightly less broken"