Revert "Change list searching"

This reverts commit 9ca36e2f53635a4ffabf549687dfaa88a321a503.

Change-Id: I8eac7951e86b8f0d5539878aba037db75b928b2c
Merge "Revert "Change list searching"" into jb-mr2