Revert "Merge remote-tracking branch 'upstream/vendor' into vendor"

This reverts commit dd1f590dfca72b4b2529633ac1886b2af81dd590, reversing
changes made to 567e22003dedeb714a56fce5ee0166da007c6ad0.