This reverts commit f935b529. The newly added patch isn't working well and breaks soem other architecture like arm64, ppc64el and s390x.