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

This reverts commit 4e8380018fce7ce84c0ef58a03e6b86e6dbd802d.