Revert to upstream version (git is hard)