Revert "UBUNTU: SAUCE: apparmor: Fix: now that insert can force replacement...

Revert "UBUNTU: SAUCE: apparmor: Fix: now that insert can force replacement use it instead of remove_and_insert"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 7c2edd90b522bb373a6be6971ba8a3cfbc99ed1d.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

security/apparmor/label.c

@@ -1858,7 +1858,7 @@ static struct aa_label *__label_update(struct aa_label *label)
 		goto insert;
 	}
 insert:
-	tmp = __aa_label_insert(labels_set(label), l, true);
+	tmp = __aa_label_remove_and_insert(labels_set(label), label, l, true);
 	if (tmp != l) {
 		aa_label_free(l);
 		l = tmp;