Falling out of water death message still does not seem to appear

Testing the fix to MC-7424, I still cant seem to get the falling out of water message to show up.

On a related note, there seems to be no message for falling out of lava.

It seems that the removal of this message has resulted in the following bug: MC-195467