CR-IC-6033#CFR-89039 fix usages instead of just use "fix" method, remove it from public API