Comment 1 for bug 1244718

Works as advertised; pushed to master, rel_2_4, and rel_2_3. Thanks, Mike!

Also, I ran into a bunch of trouble with subfield replacement in general, but that turned out to be separate from what this was trying to fix. Once I work out what is going on, I'll open a bug for that (if necessary).