Fix previous merge.

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