Revert "Merge branch 'upstream-merge'"

This reverts commit 8fc27e1aff9cfa3bc6ff9fc05da5350eb7ed3dcc, reversing
changes made to 05cc5301be2776dbc8bb6e815a47bf7b14c08bf5.