This reverts commit 3a46d91f.

This breaks the Stylist, not sure why (does it depend on something
setting the search flags before?) so revert for now.

Change-Id: Ia50feeebae8bf852c827e4f270e81e9f08d2b1ac