Revert to aa1e57ea948d.