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

This reverts commit d4b31e0c0db0e4e7d823b018f5a9a598544b6311, reversing
changes made to 1ae21310bf2bcd14ff6aaf45539ad1d7976c005f.