Fix for RTMID-20557 causes issues for chocolatey installs [RTFACT-26759]