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

This reverts commit a68c6d5bfd401ae835115e9e2fc869a6fd87d7d5, reversing
changes made to f7eb93303a405986b6a9a680cf9e8cafaedf925a.