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

This reverts commit 49180e80c4ba6d6adfcf4e0fd1d131ec6f65de3a, reversing
changes made to ccfee6541d20b18d96e88096d1305d15f9ffa320.