Reverting joint search code

Should hopefully resolve build server issue