Revert "messages"

This reverts commit 9c53b537558a8da4af7637391da380a6c6101b41.