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

This reverts commit 3255b2b195151f18eca3633359745606ae06e1ab, reversing
changes made to 96c18c02d817c02b16c82cb55c72941b306777c3.