revert r46067 also "* Follow up r46059: Add new message"