Revert commit c335fa for random_messages mod