Revert "Merge branch 'upstream-master'"

This reverts commit 64fbda833ae0d20259bd6ccd59a0fd02960aaf4a, reversing
changes made to 5e9b41e0ba1d10cf4808d38ac1a305972fe9fe90.