Revert "Better messages"

This reverts commit c6f84d7ac9bb808c52a638e4ae354c13f868ff84.