Don't require a client object in the search. It breaks existing controller software and is not really needed.

Change-Id: I38e07b4b6d2a7bce6ecbe45b6a6d6093320e4776