I upstreamed our change, https://github.com/autoconf-archive/autoconf-archive/pull/260, so sync with upstream. Slightly simplifies #25465.