[Cherrypick 4.2.1] Revert 80c59de in 4.2 branch

[katre]

This fixes #13890 by reverting 80c59de in the 4.2 series.

[gregestren]

Is the bug saying that if we also had 98d376f then all would be well? So it's a patch sequencing error?

[katre]

Yes, a bisect indicates that 98d376f should fix this, but I couldn't figure out a set of commits to cherrypick that gets it to apply cleanly. Since the original request to include 80c59de doesn't have any justification, I feel like it's reasonable to remove.