LPS-44228 Remove usages of new default value