Revert "Update MWSearch to master"

Fatal error

This reverts commit 10b7802fac92eae45a30a844e5831a4729fba677

Change-Id: Ib16305065d810e6c6e2f6a3530f912eeacf00c06