Revert "Update MWSearch to master"

Fatal error

This reverts commit f88fedfa3ed66ff03057b34d83363534e02011d5

Change-Id: Ic52e074e5f98344c0d45cbda996a15098afd1812