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

This reverts commit 0b29be0dcf00a7dd61e14f843fbb887341985c9d, reversing
changes made to 1c6cc5355d715afdfa368663543a58dfb12c8ae8.