Revert "rainbow-message id changes"

This reverts commit bca8693bad1366be76c83ddb5d6d75f58c2fb22e.