65a11b Revert part of the s390x update

Authored and Committed by tmraz 5 months ago
    Revert part of the s390x update