Revert "Fix advertise error on create/remove/update"

This reverts commit 9ae595a0cc2a38c0065144883fb50626500eea0d.