Revert "Search first"

This reverts commit 38590ac29f065d255fadca37aca6dd18401603eb.