Dupliicate e980, oh boyo!

Change-Id: Ib02f014847e2c3ccc72b2cbffdbac88850dffbaf