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

This reverts commit 7d9045e96fd37835b5781e6049c4c05afe081b8c, reversing
changes made to a113e727ed1b1275ac4baf32bc1b8dc50bf0e0c8.