Fixing left-over from rebase