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

This reverts commit 5454b8c7339af4da29a78761db90f8ba82f3e4d8, reversing
changes made to 9c80798038e571021b8289d73180d8d7ba3b1be0.