o.c.autocomplete.ui: Sync w/ 3.2.x, remove code that had been renamed