r88885: Change message as well