Remove --no-ff by default