Revert "Merge pull request #783 from JohannesPfeifer/simul_messages"

This reverts commit 6d09a89ba56311f46348a8fef22bfe1dd1924bda, reversing
changes made to 1410dc2c76e286877d96b5be7534ed090eb3ffb2.