Revert "DAQ-1022 short term fix to socket.io optimize issue"

This reverts commit e3ec882d44e5918f9a04d92c2f5aa1991962da8d.