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

This reverts commit bacd1bb6b7a0fafba15ca4c4ca39481dfd755435, reversing
changes made to cd6a004b508723751bf793e274798c30a84e1e5e.