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

This reverts commit 41826c41e2489815befc1f614d30f0a6073e0e8e, reversing
changes made to 357618caabac857c07e14ce2f69c31dc75e99696.