Merge "Turn back to the old socket schema"