[HELIX-22] Remove dependency on josql, rb=16017