Reverting breaking change made during search feature development.