After banging on it a bit more, yes, it would be nice to replace the upstream version.