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

This reverts commit e73a34de90341e0b723ab57c5db50ece26dce4f4, reversing
changes made to 563596c90ecef868a9d7e8d21a01c37a45e25fdb.