Revert "conflits" because all my changes were lost in the merge.

This reverts commit e9002c93d4da21a4ed8a8e117a9f16b4a0ac5b1e, reversing
changes made to cd6c881ac615db11be6844f978547391f495fe42.
added MessageToMapImpl for demo