[OS-BUILD PATCHv2 2/2] Revert s390x/zfcpdump part of a9d179c40281 and ecbfddd98621