Get rid of SINK_MESSAGE_PASS_SOCKET, since we don't really need it