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

This reverts commit 1d3bf028660bba77db532a1c55458e1b4d2e1941, reversing
changes made to d28557ddedec17d77cb103324bb189b1e2c0ba4d.