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

This reverts commit 630dbbb0a03afe6b6b956cfd1e18b96b7897b391, reversing
changes made to 60f36b0a3c418ba9d2735ebe7c06f8202f2ead45.