Reverse some changes from last merge

Those dependencies are still used in search-1.3.x