Revert "Issue #2662574 by RajeevK, Adita, pritish.kumar, afi13, AjitS, greyghost: Theme suggestions may not be in theme include files, Search and Views UI suggestions are not (always) found" This reverts commit 81d17351.