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

This reverts commit 5e688002a8590b744964d40c8c7e8e8c6d3b838b, reversing
changes made to f5a0dde35dccc7f1c05a50fbcb6d7a973eb26ec0.