Oh, and correction, snuck into #3116.  :)