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

This reverts commit 49a86bb167f7fa864180ce9fc23742beb063da45, reversing
changes made to 58c72e9418269a06445b26cb203432e8edf04d89.