Merge "Revert "Use the Finder's results for faster searching""