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

This reverts commit 33c911ac1814537f1ae7588c87c43be9d0a39fd5, reversing
changes made to 1abce9ce2003956870825829e7e35c690cf9e174.