[PATCHv2] Bring back if_tap check