Revert "Fix message replacement and removal in room_history"

This commit breaks edited messages. It looks like it doesn't replace the correct message after the changes in this commit. This reverts commit eebb5b5d.

Also the commit message fails to explain what it fixes.