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

This reverts commit c04f75593c5cd27fe3540d2a7a87f63fa37d58fd, reversing
changes made to e78b2f39cdfe9f882018a281b982d49f5e5bc881.