mux: drop one of the hacks comprising compute_pkt_fields2()