Undo merge of incorrect 6.1.x merge
Merge pull request #24 from NielsZeilemaker/private_search

Undo merge of incorrect 6.1.x merge