Revert "Fixed merge conflicts on Socket.io 1.1.0 update"

This reverts commit 94a5fb0b5df8ee26635e4192201c4df9c5641ed6, reversing
changes made to 370d43a9bd02afcb05a8e981af5437725a7b154e.