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

This reverts commit 37a4ca86e0c98b670f4c96c54377913196a810d8, reversing
changes made to f9d2fde7839a1c2a6a66c663808661dcd7c62176.