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

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