Revert "fixed messages"

This reverts commit 44da9bd6f13982b6df314c56454af9e08f4f22e6.
Revert fbd3877..065bf5c

This rolls back to commit fbd387776d0cf3215ffe3f3281f03d7a0e9c8422.