remove now useless condition
Merge remote-tracking branch 'origin/4745_device_with_only_mac'