Revert all commits, so that they can be reviewed as a merge