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

This reverts commit a877cf1672e0643de0c67985fad9f21ccaadfb14.