Backed out changes to ethernet.py made for edp to work as they broke cdp. Hopefully did it right this time.