Resend: Regression in 5467801f1fcbd