revert upstream commit that broke PCI until we have a better fix