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

This reverts commit 7f019f5b59c133ade7ea47e40871811f43fb55dd, reversing
changes made to 569fbe1c773042e646f96aeb81ca8764ecc3bb09.