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

This reverts commit 4e415ac82ce5de566e35900b9ea054adc333f923, reversing
changes made to 6afe942255e7742f7c1330b628fdc1c1f88f724d.