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

This reverts commit 71525f0a7cfd0a0843717156469bc821c29b73f9, reversing
changes made to 57cf2636d7ee60b2cfac0abcbf8292f3a56779b3.