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

This reverts commit 99d728a8a22d64fb70df5b3690651a0a6d4efb2d, reversing
changes made to a6d079b6645df69eca12383b635c7988f9ac1ee4.