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

This reverts commit a4dbcc4807bdbe18b74bab068a13cdc1cde86a7a, reversing
changes made to 1e062e7fcd7adcccd709c8e610aea182f7c0121f.