The previous cherry-pick required some manual intervention.

Change-Id: I3f81a0e002a74d9e64ae06428d40dc787a7f8e39
Reviewed-on: https://code.wireshark.org/review/4208
Reviewed-by: Guy Harris <guy@alum.mit.edu>