FIx inconsistent messages in r86482.