Follow-up on #18447: Unintentional deletion during merge-conflicts resolution (#20991)

After #18447 was merged, I reviewed the PR code as usual. During this
review, I realized that some code was unintentionally removed when I was
resolving merge conflicts in #18447.

Sorry!

Release Notes:

- N/A