Re: #5381: fix today's push to f18-updates-testing