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

This reverts commit a6a0295501a8b7671044d05dd36da5d9dce09097, reversing
changes made to 514c98950582acb4aa96cbfaa6fe5fccd3d8ef04.