Reverse part of message fix that had an unintended side effect.