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

This reverts commit 7e90d18c333ec6778793134416cd85faceb1b4ab, reversing
changes made to c319f912dc58e0842bf4eae854d91cb146e40f0c.