Revert EchoMessage code

This reverts commits c3ab05f3936b1bedd2e28ebf86790c0eaa45eaba and a7b2ff65ac1946ca8e7e52e00374a83ebe922627.