Put back some old movefinder code.