Revert "Merge upstream"

This reverts commit f0f68d30.
11 jobs for main in 13 minutes and 25 seconds (queued for 1 minute and 59 seconds)