This reverts commit 87f75e7785.
This caused a regression (#104138) so let's wait for it to be properly
resolved and tested before attempting a cherry-pick.
This reverts commit 87f75e7785.
This caused a regression (#104138) so let's wait for it to be properly
resolved and tested before attempting a cherry-pick.