^KT-54826 Fixed
^KT-54311
Also, do not use PSI to restore SUBSTITUTION_OVERRIDE function/property symbols