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

This reverts commit c496a52015c56725d8ea581c9978140882c4d73c, reversing
changes made to a12b998c71c7b5812df357903e1c4785d09bc585.