strip _ out of MAC address fields, #19114