These patches have been applied to the vendored source
