Revert changes around session id of sockets