Revert "Custom Messages"

This reverts commit c7c79294c67dd6ba20470ba746be1208a0372aea.