Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e"