Players and mobs do not die from great heights in shallow water

The inconsistent fall damage when falling from certain heights into water was fixed. however, you now never die when you fall in water, even when you fall 100m in a half a block deep water ( fence below water)
that's not only weird, but also brakes many current mobtraps which rely on mobs dying when they drop onto water above fences which carries the drops away. could be easily fixed by instead of resetting the fall height to zero, it cuts it in half and subtracts 5 or so, so the higher you fall, the deeper the water has to be to completly stop it.