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

This reverts commit f4baa7ffd2fead3e566f02e79d5ea5cd3517d056, reversing
changes made to f89d0592a856bc3b4719c175daf4a73085009407.