See my note at the beginning of this PR.