Revert "Empty message condition"

This reverts commit c05ec1169d6365a7237581969ae535c7375c632f.