Cherry-picking patch from debian upload 5.1.2-3 fixing the build failure, thus removing s390x tag for now.
Cherry-picking patch from debian upload 5.1.2-3 fixing the build failure, thus removing s390x tag for now.