Record-only merge of r324416. The actual code was merged in 327633, but
I forgot to add the merge info then (it wasn't so much a merge as
recreating on the branch the same conceptual change as was done on head).