totally broke messages
Revert "totally broke messages"

This reverts commit 0e32896dc0d95ec9c12cb3c423fd26fe4f7dae7f.