Fix a merge error in s390x support