
This reverts commit b44fca170255bf51afa1e5b7200154d7524fe8fb. I'm moving this to the staging branch. It's a huge rebuild (on the order of 20k jobs), and it seems like that was not noticed, and I can't see sufficient motivation to skip ahead of e.g. the CVE fixes we have in staging-next.