d1a599c2de
had a 2.1 tag, thus sending these two changes into the 2.1 branch instead of -current. Argh. I may bring these changes into the 2.1 anyway (they're benign there) so I'm not going to admin them out of 2.1 for the time being.