Revert #40475 and inherit upstream fix

Landed as 75419134