Rework upstream socket for new messaging system