* Addendum to r57875.