4482. [cleanup] Change #4455 was incomplete. [RT #43252] (cherry picked from commit 676ac3cc82)
676ac3cc82