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

This reverts commit c993a549a1bbd8c9ffc936b828f46667aafea2c2, reversing
changes made to 9dc16871ffd30a1c3a64d69aa52231e41dfa48ad.