Revert "Merge remote-tracking branch 'upstream/next'"

This reverts commit ef7906aab5fd7ac7bba929493cd45a593b2a1c9e, reversing
changes made to 133aa85fa39253b4bb585b84cd9776187e584242.