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

This reverts commit 2bc73d15a4600891abc10e54fcf77eb2e4a56d33, reversing
changes made to 8ba15c884d8c0b5f6547fe2162d4c7d49709c3c3.