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

This reverts commit 3d1ca4fd93a773ab114e474790b32a6e1732eb97, reversing
changes made to ffc80bd21fe572ba770f64f3e0cde8fe4112ae82.