Revert "change where the WS run loop is"

This reverts commit d36bd08842ac91cca24c0925a714abc7fe9be8e6.