This is a backport for #30188, but in 5.3.x we'll simply revert the optimization from 9624ea392aa1a97f3e52f383e9c62ac3c84c04eb.

Comment From: rstoyanchev

Fixed in 1c43a4c7ab46e7e5ac871b0fb1c04830c6299bc4.