Revert "Fix autocomplete regression"

This reverts commit ffc7c2668f8e1cb5d6ac5f29aa8aa7731f3b6192.
SetBadgeCount