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

This reverts commit 8f78eef851b1959e2a3f2ca8b6d0d001bc3da69e.