Revert "Merge remote-tracking branch 'origin' into next-cmake"

This reverts commit 681110827e4ae4b99a74011851e16c5dda6a53a1, reversing
changes made to 0a2ddb5f7adff916b668c69e7ed21fad8c2b1d71.