Revert the --no-ff part from previous commit

That didn't work entirely, and shouldn't be included

Signed-off-by: Max Sikström <msikstrom@op5.com>