Revert "Revert "Revert "test possible ws fix on 2.5.5"""

This reverts commit 18d4762359fb6e302288e2c6bc429fae695a30b9.