[messages] Attempt at 385, even though it doesn't seem necessary.