Attempting to fix failures after a commit for RESTWS-476