I wrote a pcap re-orderer (with scapy) just for this bug.