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

This reverts commit 981304c24ff913d957c741f3e8f5516722bf789e, reversing
changes made to fc281c4fd8a852b9bb4a73755cb423468ba41d97.