Fixes bug 1052355 - Removed supersearch-all waffle switch.

@peterbe r?