Go back to a separate connect/query API.