I totally forgot that I have already sent this patch, see #39959. It's
been a long two weeks...