Actually, how about putting the dir test back into #valid_search_path? and removing this line completely?