Fix botched attempt to merge/rebase