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

This reverts commit bdfcb470fa712764cb7d9410312d53ec8f171a9a, reversing
changes made to 85f081f1b47ca9e4f7c22234e343227089143471.