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

This reverts commit e5b2c27aa12308d899a20265ce9eb2d5bc2157b9, reversing
changes made to 44ad3b2816f5b1f7272ab97740a9575841599fa2.