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

This reverts commit 1c132e7ee6ac8b6e347a91a5dc86f7137e5b44fc.