Revert "Merge branch 'upstream'"

This reverts commit c725e71a8451356bf9cac8de1782db1fa87e4161, reversing
changes made to 5417f530ebc58aede0317543be69815a74354db9.
Revert "Revert "Merge branch 'upstream'""

This reverts commit 756a23c6c0f38f4e151a433709d0a2c96e3560e2.