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

This reverts commit 93460d4a78546cea9d7bf3decffe8094bb0ae66a.