Revert "Default to no fast forward"

This reverts commit 41a018e54cbfe49ebe1be5455d7af159589ab6d9.