Next attempt to prevent PowerPC/s390x/etc. failures when landing D98931.
mentioned in commit 66a8247e