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

This reverts commit 0c11a0e5f6d5d48493daa2611e8d50f6ce64699d, reversing
changes made to c48dfa6d1c9d761e994448960719e312e790fa4e.