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

This reverts commit bac35286864d42aa69ac3a1c35416da7450297ed, reversing
changes made to 931c0caad1fdc0e51b868ac56a2d3bf5239c5c8d.