CB-5660 Revert CB-5443 due to issues with parentheses in Windows PATH