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

This reverts commit 7959ba648465a11894917d8e43cc17de56f0edb7, reversing
changes made to 8f89271b5ca2cc526fea61d2b645620742dac618.