Port to new connect api

Authored by mlaurent on Mon, Apr 22, 4:02 PM.