Oops! Revert to previous version and [re-]apply diff.