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

This reverts commit 31d2f67bed8e6a92fe619e31b4274c1d4dbb84de, reversing
changes made to a9fbfaecdae502ca96041209b4964704bb490f0f.