Doing this as a downstream patch as all maintainers appear to be on end-of-year PTO already, and I don't want composes broken all the way till the new year.
