Revert "advertiser changes"

This reverts commit 2d0b9a8b2dc4ffe869557cf21e59c1e7dbde3df9.