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

This reverts commit 97e77324fea4f4f326c0d867561cbdabef98594f, reversing
changes made to 061c1a481578e45950858141c00db7b0e13104bb.
test