* Addendum to r58214.