Fix BC break due to MessageBodyData fixes.

Possible fix for Bug 13768