Revert to the upstream version