Revert "fix pkt_match_16 for vlan masking"

This reverts commit d785cb0817bac9cbef4cd4c4bd3982c5ccb454b9.