Revert "Merge branch 'fusionsearch'"

This reverts commit dbe4d46749ab0a1a76587882de73b17ae575c158, reversing
changes made to fdc9ac201337204a84107ab165956aecf3901fec.