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

This reverts commit cb473df1b8cb310563c49369f0c9fa2d021d3c95, reversing
changes made to 354dad7392110b768dac7311527bb2f3428abfbd.