This commit backports a66f7c1eb2 to various ports. It doesn't bring that backport to ports that fail to build anyway.
a66f7c1eb2