Originally I had tried sweeping/cherry-picking this from 21.2, but with all the three-way merges and commits that involve other packages/directories that was rather painful, so this is now just a direct copy from the current state in 21.2.
