Endermen killing self to get to player in water

What the subject says. Previously if you got an enderman angry and ran to water it would run to the edge of water and move along the edge.

 

In this version endermen run to the water go inside, teleport away after taking damage, run back to you, go into the water take damage, teleport away, etc until they take enough water damage they die.