Revert "Fixed reviewer tool search for both waffle states (bug 880678)"

This broke normal API results because it bypassed the Meta.fields data
population.

This reverts commit 110fc05df404b19ce06594f22b1b6f139267d60e.