New Fix por issue #1612

[jsr356] Workaround https://java.net/jira/browse/WEBSOCKET_SPEC-228
Revert "New Fix por issue #1612"

This reverts commit 96599a2b90bce57cb5b5e3286045b1087fa0c176.
New fix for issue #1612

[jsr356] Workaround https://java.net/jira/browse/WEBSOCKET_SPEC-228
Merge branch 'mvsmasiero-master'
Improve the patch for broken spec