FS-7117 #comment revert bf5210bf and implement it in ws.c please be sure to learn to use git commit hooks to properly associate commits with jiras