We need to fix #21460 for 2.2.x as well.

Comment From: aivinog1

@mbhave Hello! Do you mind if I take this issue? I understand what needs to be done.

Comment From: mbhave

Thanks for the offer @aivinog1. We accidentally removed the file so it just needs to be added back. I think it's best if the team handles this one.

Comment From: mbhave

Actually it looks like it never got removed from 2.2.x. So we can just close this issue.

Comment From: aivinog1

@mbhave ok, thanks!