R1:8879118b696f

Fix a mid-air collision around SearchService roles

My D17571 didn't interact nicely with D17564, which added callsites for one of
the methods I removed.

Auditors: 20after4