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

This reverts commit 57fe4462649fa7b44bb3715af392830175d81724, reversing
changes made to 1b959285301a6d55c26a3f7fe64977d3c0a91910.