Use upstream version