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

This reverts commit 914ca4acd33cd14d58825793c84a650da86241a3, reversing
changes made to 614b1c34f74a1e0bb4bcbf7e80005d51ef82a400.