Add --no-ff by default (again)