I think this was the result of a bad rebase...