Fix an issue caused by git's "noop rebases"