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

This reverts commit 86be7bd4728e6ece53baa0e3417f70c766adc4e5, reversing
changes made to 52fa9cfc5c494b798697edfbffec1a9bbefb2983.