Revert "Added a helper function to call the real search, makes the interface a little nicer"
Something broke in this commit, just going to revert it for now since it was
stylistic only.

This reverts commit 2fac714fadf38cddbafa8708d36af69629caf85a.